Merge some safe fixes into stable

diff --git a/busybox/coreutils/dos2unix.c b/busybox/coreutils/dos2unix.c
index e110680c387e5c9c839f21c5c5905c11ff652045..cb30c568b617d31c2ab56cd1fb5da38945ad16f5 100644 (file)
--- a/busybox/coreutils/dos2unix.c
+++ b/busybox/coreutils/dos2unix.c
@@ -30,14 +30,19 @@
 #include <string.h>
 #include <getopt.h>
 #include <unistd.h>
+#include <stdint.h>
 #include <fcntl.h>
 #include <sys/time.h>
 #include "busybox.h"
 
-/* Teach older glibc and libc5 what a uint64_t is */
-#if (__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 3)
-typedef unsigned long int       uint64_t;
-#endif
+
+/* We are making a lame pseudo-random string generator here.  in
+ * convert(), each pass through the while loop will add more and more
+ * stuff into value, which is _supposed_ to wrap.  We don't care about
+ * it being accurate.  We care about it being messy, since we then mod
+ * it by the sizeof(letters) and then use that as an index into letters
+ * to pick a random letter to add to out temporary file. */
+typedef unsigned long int bb_uint64_t;
 
 static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 
@@ -47,7 +52,7 @@ static int convert(char *fn, int ConvType)
        int c, fd;
        struct timeval tv;
        char tempFn[BUFSIZ];
-       static uint64_t value=0;
+       static bb_uint64_t value=0;
        FILE *in = stdin, *out = stdout;
 
        if (fn != NULL) {
@@ -64,7 +69,7 @@ static int convert(char *fn, int ConvType)
                     * random filename based (and in the same dir as)
                     * the input file... */
                    gettimeofday (&tv, NULL);
-                   value += ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec ^ getpid ();
+                   value += ((bb_uint64_t) tv.tv_usec << 16) ^ tv.tv_sec ^ getpid ();
                    tempFn[++c] = letters[value % 62];
                    tempFn[c+1] = '\0';
                    value /= 62;
@@ -138,7 +143,9 @@ static int convert(char *fn, int ConvType)
                return -2;
            }
 
-           /* Assume they are both on the same filesystem */
+           /* Assume they are both on the same filesystem (which
+            * should be true since we put them into the same directory
+            * so we _should_ be ok, but you never know... */
            if (rename(tempFn, fn) < 0) {
                perror_msg("unable to rename '%s' as '%s'", tempFn, fn);
                return -1;

diff --git a/busybox/dos2unix.c b/busybox/dos2unix.c
index e110680c387e5c9c839f21c5c5905c11ff652045..cb30c568b617d31c2ab56cd1fb5da38945ad16f5 100644 (file)
--- a/busybox/dos2unix.c
+++ b/busybox/dos2unix.c
@@ -30,14 +30,19 @@
 #include <string.h>
 #include <getopt.h>
 #include <unistd.h>
+#include <stdint.h>
 #include <fcntl.h>
 #include <sys/time.h>
 #include "busybox.h"
 
-/* Teach older glibc and libc5 what a uint64_t is */
-#if (__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 3)
-typedef unsigned long int       uint64_t;
-#endif
+
+/* We are making a lame pseudo-random string generator here.  in
+ * convert(), each pass through the while loop will add more and more
+ * stuff into value, which is _supposed_ to wrap.  We don't care about
+ * it being accurate.  We care about it being messy, since we then mod
+ * it by the sizeof(letters) and then use that as an index into letters
+ * to pick a random letter to add to out temporary file. */
+typedef unsigned long int bb_uint64_t;
 
 static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 
@@ -47,7 +52,7 @@ static int convert(char *fn, int ConvType)
        int c, fd;
        struct timeval tv;
        char tempFn[BUFSIZ];
-       static uint64_t value=0;
+       static bb_uint64_t value=0;
        FILE *in = stdin, *out = stdout;
 
        if (fn != NULL) {
@@ -64,7 +69,7 @@ static int convert(char *fn, int ConvType)
                     * random filename based (and in the same dir as)
                     * the input file... */
                    gettimeofday (&tv, NULL);
-                   value += ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec ^ getpid ();
+                   value += ((bb_uint64_t) tv.tv_usec << 16) ^ tv.tv_sec ^ getpid ();
                    tempFn[++c] = letters[value % 62];
                    tempFn[c+1] = '\0';
                    value /= 62;
@@ -138,7 +143,9 @@ static int convert(char *fn, int ConvType)
                return -2;
            }
 
-           /* Assume they are both on the same filesystem */
+           /* Assume they are both on the same filesystem (which
+            * should be true since we put them into the same directory
+            * so we _should_ be ok, but you never know... */
            if (rename(tempFn, fn) < 0) {
                perror_msg("unable to rename '%s' as '%s'", tempFn, fn);
                return -1;

diff --git a/busybox/insmod.c b/busybox/insmod.c
index 0137152788482fa032c088720f46a72716a798ed..6765f82d62b4cff07225468f741decd22f3d80fd 100644 (file)
--- a/busybox/insmod.c
+++ b/busybox/insmod.c
@@ -133,7 +133,7 @@
 #ifndef MODUTILS_MODULE_H
 static const int MODUTILS_MODULE_H = 1;
 
-#ident "$Id: insmod.c,v 1.70.2.1 2001/08/10 18:22:15 andersen Exp $"
+#ident "$Id: insmod.c,v 1.70.2.2 2001/08/22 05:29:19 andersen Exp $"
 
 /* This file contains the structures used by the 2.0 and 2.1 kernels.
    We do not use the kernel headers directly because we do not wish
@@ -350,7 +350,7 @@ int delete_module(const char *);
 #ifndef MODUTILS_OBJ_H
 static const int MODUTILS_OBJ_H = 1;
 
-#ident "$Id: insmod.c,v 1.70.2.1 2001/08/10 18:22:15 andersen Exp $"
+#ident "$Id: insmod.c,v 1.70.2.2 2001/08/22 05:29:19 andersen Exp $"
 
 /* The relocatable object is manipulated using elfin types.  */
 
@@ -3160,9 +3160,8 @@ static struct obj_file *obj_load(FILE * fp, int loadprogbits)
  * kernel for the module
  */
 
-static int obj_load_progbits(FILE * fp, struct obj_file* f)
+static int obj_load_progbits(FILE * fp, struct obj_file* f, char* imagebase)
 {
-       char* imagebase = (char*) f->imagebase;
        ElfW(Addr) base = f->baseaddr;
        struct obj_section* sec;
        
@@ -3178,7 +3177,7 @@ static int obj_load_progbits(FILE * fp, struct obj_file* f)
                sec->contents = imagebase + (sec->header.sh_addr - base);
                fseek(fp, sec->header.sh_offset, SEEK_SET);
                if (fread(sec->contents, sec->header.sh_size, 1, fp) != 1) {
-                       errorMsg("error reading ELF section data: %s\n", strerror(errno));
+                       error_msg("error reading ELF section data: %s\n", strerror(errno));
                        return 0;
                }
 
@@ -3458,9 +3457,7 @@ extern int insmod_main( int argc, char **argv)
         * the PROGBITS section was not loaded by the obj_load
         * now we can load them directly into the kernel memory
         */
-       //      f->imagebase = (char*) m_addr;
-       f->imagebase = (ElfW(Addr)) m_addr;
-       if (!obj_load_progbits(fp, f)) {
+       if (!obj_load_progbits(fp, f, (char*)m_addr)) {
                delete_module(m_name);
                goto out;
        }

diff --git a/busybox/modutils/insmod.c b/busybox/modutils/insmod.c
index 0137152788482fa032c088720f46a72716a798ed..6765f82d62b4cff07225468f741decd22f3d80fd 100644 (file)
--- a/busybox/modutils/insmod.c
+++ b/busybox/modutils/insmod.c
@@ -133,7 +133,7 @@
 #ifndef MODUTILS_MODULE_H
 static const int MODUTILS_MODULE_H = 1;
 
-#ident "$Id: insmod.c,v 1.70.2.1 2001/08/10 18:22:15 andersen Exp $"
+#ident "$Id: insmod.c,v 1.70.2.2 2001/08/22 05:29:19 andersen Exp $"
 
 /* This file contains the structures used by the 2.0 and 2.1 kernels.
    We do not use the kernel headers directly because we do not wish
@@ -350,7 +350,7 @@ int delete_module(const char *);
 #ifndef MODUTILS_OBJ_H
 static const int MODUTILS_OBJ_H = 1;
 
-#ident "$Id: insmod.c,v 1.70.2.1 2001/08/10 18:22:15 andersen Exp $"
+#ident "$Id: insmod.c,v 1.70.2.2 2001/08/22 05:29:19 andersen Exp $"
 
 /* The relocatable object is manipulated using elfin types.  */
 
@@ -3160,9 +3160,8 @@ static struct obj_file *obj_load(FILE * fp, int loadprogbits)
  * kernel for the module
  */
 
-static int obj_load_progbits(FILE * fp, struct obj_file* f)
+static int obj_load_progbits(FILE * fp, struct obj_file* f, char* imagebase)
 {
-       char* imagebase = (char*) f->imagebase;
        ElfW(Addr) base = f->baseaddr;
        struct obj_section* sec;
        
@@ -3178,7 +3177,7 @@ static int obj_load_progbits(FILE * fp, struct obj_file* f)
                sec->contents = imagebase + (sec->header.sh_addr - base);
                fseek(fp, sec->header.sh_offset, SEEK_SET);
                if (fread(sec->contents, sec->header.sh_size, 1, fp) != 1) {
-                       errorMsg("error reading ELF section data: %s\n", strerror(errno));
+                       error_msg("error reading ELF section data: %s\n", strerror(errno));
                        return 0;
                }
 
@@ -3458,9 +3457,7 @@ extern int insmod_main( int argc, char **argv)
         * the PROGBITS section was not loaded by the obj_load
         * now we can load them directly into the kernel memory
         */
-       //      f->imagebase = (char*) m_addr;
-       f->imagebase = (ElfW(Addr)) m_addr;
-       if (!obj_load_progbits(fp, f)) {
+       if (!obj_load_progbits(fp, f, (char*)m_addr)) {
                delete_module(m_name);
                goto out;
        }