emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Scrub things and ditch uint64_t and use a custom type name

Browse Source 
to avoid C lib compatibility problems.
This commit is contained in:
Eric Andersen 2001-08-22 05:06:29 +00:00
parent d36cdd25a5
commit 59443965ad
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
coreutils/dos2unix.c
View File

@ -30,14 +30,18 @@
#include <string.h> #include <string.h>
#include <getopt.h> #include <getopt.h>
#include <unistd.h> #include <unistd.h>
#include <stdint.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/time.h> #include <sys/time.h>
#include "busybox.h" #include "busybox.h"
/* Teach older glibc and libc5 what a uint64_t is */ /* We are making a lame pseudo-random string generator here. in
#if (__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 3) * convert(), each pass through the while loop will add more and more
typedef unsigned long int uint64_t; * stuff into value, which is _supposed_ to wrap. We don't care about
#endif * 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"; static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
@ -47,7 +51,7 @@ static int convert(char *fn, int ConvType)
int c, fd; int c, fd;
struct timeval tv; struct timeval tv;
char tempFn[BUFSIZ]; char tempFn[BUFSIZ];
static uint64_t value=0; static bb_uint64_t value=0;
FILE *in = stdin, *out = stdout; FILE *in = stdin, *out = stdout;
if (fn != NULL) { if (fn != NULL) {
@ -64,7 +68,7 @@ static int convert(char *fn, int ConvType)
* random filename based (and in the same dir as) * random filename based (and in the same dir as)
* the input file... */ * the input file... */
gettimeofday (&tv, NULL); 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] = letters[value % 62];
tempFn[c+1] = '\0'; tempFn[c+1] = '\0';
value /= 62; value /= 62;
@ -138,7 +142,9 @@ static int convert(char *fn, int ConvType)
return -2; 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) { if (rename(tempFn, fn) < 0) {
perror_msg("unable to rename '%s' as '%s'", tempFn, fn); perror_msg("unable to rename '%s' as '%s'", tempFn, fn);
return -1; return -1;

20
dos2unix.c
View File

@ -30,14 +30,18 @@
#include <string.h> #include <string.h>
#include <getopt.h> #include <getopt.h>
#include <unistd.h> #include <unistd.h>
#include <stdint.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/time.h> #include <sys/time.h>
#include "busybox.h" #include "busybox.h"
/* Teach older glibc and libc5 what a uint64_t is */ /* We are making a lame pseudo-random string generator here. in
#if (__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 3) * convert(), each pass through the while loop will add more and more
typedef unsigned long int uint64_t; * stuff into value, which is _supposed_ to wrap. We don't care about
#endif * 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"; static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
@ -47,7 +51,7 @@ static int convert(char *fn, int ConvType)
int c, fd; int c, fd;
struct timeval tv; struct timeval tv;
char tempFn[BUFSIZ]; char tempFn[BUFSIZ];
static uint64_t value=0; static bb_uint64_t value=0;
FILE *in = stdin, *out = stdout; FILE *in = stdin, *out = stdout;
if (fn != NULL) { if (fn != NULL) {
@ -64,7 +68,7 @@ static int convert(char *fn, int ConvType)
* random filename based (and in the same dir as) * random filename based (and in the same dir as)
* the input file... */ * the input file... */
gettimeofday (&tv, NULL); 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] = letters[value % 62];
tempFn[c+1] = '\0'; tempFn[c+1] = '\0';
value /= 62; value /= 62;
@ -138,7 +142,9 @@ static int convert(char *fn, int ConvType)
return -2; 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) { if (rename(tempFn, fn) < 0) {
perror_msg("unable to rename '%s' as '%s'", tempFn, fn); perror_msg("unable to rename '%s' as '%s'", tempFn, fn);
return -1; return -1;