Sanity.

CVS patchset: 5382
CVS date: 2002/04/08 22:52:45

diff --git a/Doxyfile.in b/Doxyfile.in
index c6c3ff5..597faa4 100644 (file)
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -452,8 +452,12 @@ INPUT                  = \
        @top_srcdir@/popt/popthelp.c \
        @top_srcdir@/popt/poptint.h \
        @top_srcdir@/popt/poptparse.c \
+       @top_srcdir@/python/db-py.c \
+       @top_srcdir@/python/db-py.h \
        @top_srcdir@/python/hash.c \
        @top_srcdir@/python/hash.h \
+       @top_srcdir@/python/header-py.c \
+       @top_srcdir@/python/header-py.h \
        @top_srcdir@/python/rpmmodule.c \
        @top_srcdir@/python/upgrade.c \
        @top_srcdir@/python/upgrade.h \

diff --git a/lib/signature.c b/lib/signature.c
index 3c85726..c573800 100644 (file)
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -22,6 +22,10 @@
 /*@access DIGEST_CTX@*/                /* XXX compared with NULL */
 /*@access pgpDig@*/
 
+#if !defined(__GLIBC__)
+char ** environ = NULL;
+#endif
+
 int rpmLookupSignatureType(int action)
 {
     /*@unchecked@*/

diff --git a/rpmio/rpmmessages.h b/rpmio/rpmmessages.h
index 3f761a0..fe0d0c9 100644 (file)
--- a/rpmio/rpmmessages.h
+++ b/rpmio/rpmmessages.h
@@ -47,7 +47,9 @@ typedef enum rpmCallbackType_e {
     RPMCALLBACK_TRANS_STOP,
     RPMCALLBACK_UNINST_PROGRESS,
     RPMCALLBACK_UNINST_START,
-    RPMCALLBACK_UNINST_STOP
+    RPMCALLBACK_UNINST_STOP,
+    RPMCALLBACK_UNPACK_ERROR,
+    RPMCALLBACK_CPIO_ERROR
 } rpmCallbackType;
 
 /**

diff --git a/rpmqv.c b/rpmqv.c
index 8e79e42..f355f0b 100755 (executable)
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -278,7 +278,7 @@ static void printUsage(void)
 }
 
 /*@-mods@*/ /* FIX: shrug */
-int main(int argc, const char ** argv)
+int main(int argc, const char ** argv, char ** envp)
        /*@globals __assert_program_name, rpmEVR, RPMVERSION,
                rpmGlobalMacroContext, rpmCLIMacroContext,
                fileSystem, internalState@*/
@@ -329,6 +329,10 @@ int main(int argc, const char ** argv)
 #endif
     setprogname(argv[0]);      /* Retrofit glibc __progname */
 
+#if !defined(__GLIBC__)
+    environ = envp;
+#endif  
+
     /* XXX glibc churn sanity */
     if (__progname == NULL) {
        if ((__progname = strrchr(argv[0], '/')) != NULL) __progname++;

diff --git a/system.h b/system.h
index 9567446..b51f2f2 100644 (file)
--- a/system.h
+++ b/system.h
@@ -28,6 +28,9 @@ extern int chroot (const char *__path)
        /*@modifies errno, systemState @*/;
 /*@=superuser =declundef =incondefs @*/
 #endif
+#if !defined(__GLIBC__)
+extern char ** environ;
+#endif
 #endif
 
 #if TIME_WITH_SYS_TIME