X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=utility.c;h=62c47288561ee3a108bf6771f81dafdff0ac2d04;hb=46f44d24fcc25a5d6e13e0453485881bdf147e91;hp=c8bd5737a68f6169d60981f4c4e602fab219adf8;hpb=4e61db228496a1ef1b81773d41116ebb659cebe3;p=oweals%2Fbusybox.git diff --git a/utility.c b/utility.c index c8bd5737a..62c472885 100644 --- a/utility.c +++ b/utility.c @@ -25,7 +25,7 @@ * */ -#include "internal.h" +#include "busybox.h" #if defined (BB_CHMOD_CHOWN_CHGRP) \ || defined (BB_CP_MV) \ || defined (BB_FIND) \ @@ -33,7 +33,7 @@ || defined (BB_LS) \ || defined (BB_RM) \ || defined (BB_TAR) -/* same conditions as recursiveAction */ +/* same conditions as recursive_action */ #define bb_need_name_too_long #endif #define bb_need_memory_exhausted @@ -53,11 +53,6 @@ #include #include /* for uname(2) */ -#if defined BB_FEATURE_MOUNT_LOOP -#include -#include /* Pull in loop device support */ -#endif - /* Busybox mount uses either /proc/filesystems or /dev/mtab to get the * list of available filesystems used for the -t auto option */ #if defined BB_FEATURE_USE_PROCFS && defined BB_FEATURE_USE_DEVPS_PATCH @@ -86,32 +81,65 @@ extern void usage(const char *usage) { fprintf(stderr, "%s\n\n", full_version); fprintf(stderr, "Usage: %s\n", usage); - exit FALSE; + exit(EXIT_FAILURE); } -extern void errorMsg(const char *s, ...) +static void verror_msg(const char *s, va_list p) { - va_list p; - - va_start(p, s); fflush(stdout); fprintf(stderr, "%s: ", applet_name); vfprintf(stderr, s, p); - va_end(p); fflush(stderr); } -extern void fatalError(const char *s, ...) +extern void error_msg(const char *s, ...) { va_list p; va_start(p, s); + verror_msg(s, p); + va_end(p); +} + +extern void error_msg_and_die(const char *s, ...) +{ + va_list p; + + va_start(p, s); + verror_msg(s, p); + va_end(p); + exit(EXIT_FAILURE); +} + +static void vperror_msg(const char *s, va_list p) +{ fflush(stdout); fprintf(stderr, "%s: ", applet_name); - vfprintf(stderr, s, p); - va_end(p); + if (s && *s) { + vfprintf(stderr, s, p); + fputs(": ", stderr); + } + fprintf(stderr, "%s\n", strerror(errno)); fflush(stderr); - exit( FALSE); +} + +extern void perror_msg(const char *s, ...) +{ + va_list p; + + va_start(p, s); + vperror_msg(s, p); + va_end(p); +} + +extern void perror_msg_and_die(const char *s, ...) +{ + va_list p; + + va_start(p, s); + vperror_msg(s, p); + va_end(p); + exit(EXIT_FAILURE); } #if defined BB_INIT @@ -128,7 +156,9 @@ extern int get_kernel_revision(void) perror("cannot get system information"); return (0); } - sscanf(name.version, "%d.%d.%d", &major, &minor, &patch); + major = atoi(strtok(name.release, ".")); + minor = atoi(strtok(NULL, ".")); + patch = atoi(strtok(NULL, ".")); return major * 65536 + minor * 256 + patch; } #endif /* BB_INIT */ @@ -231,12 +261,12 @@ void reset_ino_dev_hashtable(void) #endif /* BB_CP_MV || BB_DU */ -#if defined (BB_CP_MV) || defined (BB_DU) || defined (BB_LN) +#if defined (BB_CP_MV) || defined (BB_DU) || defined (BB_LN) || defined (BB_AR) /* * Return TRUE if a fileName is a directory. * Nonexistant files return FALSE. */ -int isDirectory(const char *fileName, const int followLinks, struct stat *statBuf) +int is_directory(const char *fileName, const int followLinks, struct stat *statBuf) { int status; int didMalloc = 0; @@ -264,23 +294,23 @@ int isDirectory(const char *fileName, const int followLinks, struct stat *statBu } #endif -#if defined (BB_AR) +#if defined (BB_AR) || defined BB_CP_MV /* - * Copy readSize bytes between two file descriptors + * Copy chunksize bytes between two file descriptors */ -int copySubFile(int srcFd, int dstFd, size_t remaining) +int copy_file_chunk(int srcfd, int dstfd, size_t chunksize) { size_t size; - char buffer[BUFSIZ]; + char buffer[BUFSIZ]; /* BUFSIZ is declared in stdio.h */ - while (remaining > 0) { - if (remaining > BUFSIZ) + while (chunksize > 0) { + if (chunksize > BUFSIZ) size = BUFSIZ; else - size = remaining; - if (fullWrite(dstFd, buffer, fullRead(srcFd, buffer, size)) < size) + size = chunksize; + if (full_write(dstfd, buffer, full_read(srcfd, buffer, size)) < size) return(FALSE); - remaining -= size; + chunksize -= size; } return (TRUE); } @@ -295,7 +325,7 @@ int copySubFile(int srcFd, int dstFd, size_t remaining) * -Erik Andersen */ int -copyFile(const char *srcName, const char *destName, +copy_file(const char *srcName, const char *destName, int setModes, int followLinks, int forceFlag) { int rfd; @@ -328,7 +358,7 @@ copyFile(const char *srcName, const char *destName, if ((srcStatBuf.st_dev == dstStatBuf.st_dev) && (srcStatBuf.st_ino == dstStatBuf.st_ino)) { - errorMsg("Copying file \"%s\" to itself\n", srcName); + error_msg("Copying file \"%s\" to itself\n", srcName); return FALSE; } @@ -393,7 +423,7 @@ copyFile(const char *srcName, const char *destName, return FALSE; } - if (copySubFile(rfd, wfd, srcStatBuf.st_size)==FALSE) + if (copy_file_chunk(rfd, wfd, srcStatBuf.st_size)==FALSE) goto error_exit; close(rfd); @@ -406,17 +436,17 @@ copyFile(const char *srcName, const char *destName, /* This is fine, since symlinks never get here */ if (chown(destName, srcStatBuf.st_uid, srcStatBuf.st_gid) < 0) { perror(destName); - exit FALSE; + exit(EXIT_FAILURE); } if (chmod(destName, srcStatBuf.st_mode) < 0) { perror(destName); - exit FALSE; + exit(EXIT_FAILURE); } times.actime = srcStatBuf.st_atime; times.modtime = srcStatBuf.st_mtime; if (utime(destName, ×) < 0) { perror(destName); - exit FALSE; + exit(EXIT_FAILURE); } } @@ -433,7 +463,7 @@ copyFile(const char *srcName, const char *destName, -#if defined BB_TAR || defined BB_LS +#if defined BB_TAR || defined BB_LS ||defined BB_AR #define TYPEINDEX(mode) (((mode) >> 12) & 0x0f) #define TYPECHAR(mode) ("0pcCd?bB-?l?s???" [TYPEINDEX(mode)]) @@ -452,16 +482,16 @@ static const mode_t MBIT[] = { S_IROTH, S_IWOTH, S_IXOTH }; -#define MODE1 "rwxrwxrwx" -#define MODE0 "---------" -#define SMODE1 "..s..s..t" -#define SMODE0 "..S..S..T" +static const char MODE1[] = "rwxrwxrwx"; +static const char MODE0[] = "---------"; +static const char SMODE1[] = "..s..s..t"; +static const char SMODE0[] = "..S..S..T"; /* * Return the standard ls-like mode string from a file mode. * This is static and so is overwritten on each call. */ -const char *modeString(int mode) +const char *mode_string(int mode) { static char buf[12]; @@ -484,7 +514,7 @@ const char *modeString(int mode) * Return the standard ls-like time string from a time_t * This is static and so is overwritten on each call. */ -const char *timeString(time_t timeVal) +const char *time_string(time_t timeVal) { time_t now; char *str; @@ -512,7 +542,7 @@ const char *timeString(time_t timeVal) * This does multiple writes as necessary. * Returns the amount written, or -1 on an error. */ -int fullWrite(int fd, const char *buf, int len) +int full_write(int fd, const char *buf, int len) { int cc; int total; @@ -535,14 +565,14 @@ int fullWrite(int fd, const char *buf, int len) #endif /* BB_TAR || BB_CP_MV || BB_AR */ -#if defined BB_TAR || defined BB_TAIL || defined BB_AR || defined BB_SH +#if defined BB_TAR || defined BB_TAIL || defined BB_AR || defined BB_SH || defined BB_CP_MV /* * Read all of the supplied buffer from a file. * This does multiple reads as necessary. * Returns the amount read, or -1 on an error. * A short read is returned on an end of file. */ -int fullRead(int fd, char *buf, int len) +int full_read(int fd, char *buf, int len) { int cc; int total; @@ -581,12 +611,12 @@ int fullRead(int fd, char *buf, int len) * location, and do something (something specified * by the fileAction and dirAction function pointers). * - * Unfortunatly, while nftw(3) could replace this and reduce + * Unfortunately, while nftw(3) could replace this and reduce * code size a bit, nftw() wasn't supported before GNU libc 2.1, * and so isn't sufficiently portable to take over since glibc2.1 * is so stinking huge. */ -int recursiveAction(const char *fileName, +int recursive_action(const char *fileName, int recurse, int followLinks, int depthFirst, int (*fileAction) (const char *fileName, struct stat * statbuf, @@ -611,7 +641,7 @@ int recursiveAction(const char *fileName, "status=%d followLinks=%d TRUE=%d\n", status, followLinks, TRUE); #endif - perror(fileName); + perror_msg("%s", fileName); return FALSE; } @@ -636,13 +666,13 @@ int recursiveAction(const char *fileName, dir = opendir(fileName); if (!dir) { - perror(fileName); + perror_msg("%s", fileName); return FALSE; } if (dirAction != NULL && depthFirst == FALSE) { status = dirAction(fileName, &statbuf, userData); if (status == FALSE) { - perror(fileName); + perror_msg("%s", fileName); return FALSE; } } @@ -654,13 +684,13 @@ int recursiveAction(const char *fileName, continue; } if (strlen(fileName) + strlen(next->d_name) + 1 > BUFSIZ) { - errorMsg(name_too_long); + error_msg(name_too_long); return FALSE; } memset(nextFile, 0, sizeof(nextFile)); sprintf(nextFile, "%s/%s", fileName, next->d_name); status = - recursiveAction(nextFile, TRUE, followLinks, depthFirst, + recursive_action(nextFile, TRUE, followLinks, depthFirst, fileAction, dirAction, userData); if (status == FALSE) { closedir(dir); @@ -669,13 +699,13 @@ int recursiveAction(const char *fileName, } status = closedir(dir); if (status < 0) { - perror(fileName); + perror_msg("%s", fileName); return FALSE; } if (dirAction != NULL && depthFirst == TRUE) { status = dirAction(fileName, &statbuf, userData); if (status == FALSE) { - perror(fileName); + perror_msg("%s", fileName); return FALSE; } } @@ -692,14 +722,14 @@ int recursiveAction(const char *fileName, -#if defined (BB_TAR) || defined (BB_MKDIR) +#if defined (BB_TAR) || defined (BB_MKDIR) || defined (BB_AR) /* * Attempt to create the directories along the specified path, except for * the final component. The mode is given for the final directory only, * while all previous ones get default protections. Errors are not reported * here, as failures to restore files can be reported later. */ -extern int createPath(const char *name, int mode) +extern int create_path(const char *name, int mode) { char *cp; char *cpOld; @@ -727,7 +757,7 @@ extern int createPath(const char *name, int mode) #if defined (BB_CHMOD_CHOWN_CHGRP) || defined (BB_MKDIR) \ - || defined (BB_MKFIFO) || defined (BB_MKNOD) + || defined (BB_MKFIFO) || defined (BB_MKNOD) || defined (BB_AR) /* [ugoa]{+|-|=}[rwxst] */ @@ -1028,7 +1058,7 @@ int get_console_fd(char *tty_name) if (is_a_console(fd)) return fd; - errorMsg("Couldnt get a file descriptor referring to the console\n"); + error_msg("Couldnt get a file descriptor referring to the console\n"); return -1; /* total failure */ } @@ -1149,7 +1179,7 @@ extern int check_wildcard_match(const char *text, const char *pattern) * Given any other file (or directory), find the mount table entry for its * filesystem. */ -extern struct mntent *findMountPoint(const char *name, const char *table) +extern struct mntent *find_mount_point(const char *name, const char *table) { struct stat s; dev_t mountDevice; @@ -1189,16 +1219,16 @@ extern struct mntent *findMountPoint(const char *name, const char *table) * Read a number with a possible multiplier. * Returns -1 if the number format is illegal. */ -extern long getNum(const char *cp) +extern long atoi_w_units(const char *cp) { long value; - if (!isDecimal(*cp)) + if (!is_decimal(*cp)) return -1; value = 0; - while (isDecimal(*cp)) + while (is_decimal(*cp)) value = value * 10 + *cp++ - '0'; switch (*cp++) { @@ -1262,14 +1292,14 @@ extern int device_open(char *device, int mode) #endif #if defined BB_FEATURE_USE_DEVPS_PATCH -/* findPidByName() +/* find_pid_by_name() * * This finds the pid of the specified process, * by using the /dev/ps device driver. * * Returns a list of all matching PIDs */ -extern pid_t* findPidByName( char* pidName) +extern pid_t* find_pid_by_name( char* pidName) { int fd, i, j; char device[] = "/dev/ps"; @@ -1280,22 +1310,22 @@ extern pid_t* findPidByName( char* pidName) /* open device */ fd = open(device, O_RDONLY); if (fd < 0) - fatalError( "open failed for `%s': %s\n", device, strerror (errno)); + error_msg_and_die( "open failed for `%s': %s\n", device, strerror (errno)); /* Find out how many processes there are */ if (ioctl (fd, DEVPS_GET_NUM_PIDS, &num_pids)<0) - fatalError( "\nDEVPS_GET_PID_LIST: %s\n", strerror (errno)); + error_msg_and_die( "\nDEVPS_GET_PID_LIST: %s\n", strerror (errno)); /* Allocate some memory -- grab a few extras just in case * some new processes start up while we wait. The kernel will * just ignore any extras if we give it too many, and will trunc. * the list if we give it too few. */ - pid_array = (pid_t*) calloc( num_pids+10, sizeof(pid_t)); + pid_array = (pid_t*) xcalloc( num_pids+10, sizeof(pid_t)); pid_array[0] = num_pids+10; /* Now grab the pid list */ if (ioctl (fd, DEVPS_GET_PID_LIST, pid_array)<0) - fatalError( "\nDEVPS_GET_PID_LIST: %s\n", strerror (errno)); + error_msg_and_die( "\nDEVPS_GET_PID_LIST: %s\n", strerror (errno)); /* Now search for a match */ for (i=1, j=0; id_name)) continue; - /* Now open the status file */ - sprintf(filename, "/proc/%s/status", next->d_name); + sprintf(filename, "/proc/%s/cmdline", next->d_name); status = fopen(filename, "r"); if (!status) { continue; @@ -1377,24 +1403,12 @@ extern pid_t* findPidByName( char* pidName) fgets(buffer, 256, status); fclose(status); - /* Make sure we only match on the process name */ - p=buffer+5; /* Skip the name */ - while ((p)++) { - if (*p==0 || *p=='\n') { - *p='\0'; - break; - } - } - p=buffer+6; /* Skip the "Name:\t" */ - - if ((strstr(p, pidName) != NULL) - && (strlen(pidName) == strlen(p))) { - pidList=realloc( pidList, sizeof(pid_t) * (i+2)); - if (pidList==NULL) - fatalError(memory_exhausted); + if (strstr(get_last_path_component(buffer), pidName) != NULL) { + pidList=xrealloc( pidList, sizeof(pid_t) * (i+2)); pidList[i++]=strtol(next->d_name, NULL, 0); } } + if (pidList) pidList[i]=0; return pidList; @@ -1409,7 +1423,7 @@ extern void *xmalloc(size_t size) void *ptr = malloc(size); if (!ptr) - fatalError(memory_exhausted); + error_msg_and_die(memory_exhausted); return ptr; } @@ -1417,7 +1431,7 @@ extern void *xrealloc(void *old, size_t size) { void *ptr = realloc(old, size); if (!ptr) - fatalError(memory_exhausted); + error_msg_and_die(memory_exhausted); return ptr; } @@ -1425,12 +1439,12 @@ extern void *xcalloc(size_t nmemb, size_t size) { void *ptr = calloc(nmemb, size); if (!ptr) - fatalError(memory_exhausted); + error_msg_and_die(memory_exhausted); return ptr; } #endif -#if defined BB_FEATURE_NFSMOUNT || defined BB_SH +#if defined BB_FEATURE_NFSMOUNT || defined BB_LS || defined BB_SH || defined BB_WGET # ifndef DMALLOC extern char * xstrdup (const char *s) { char *t; @@ -1441,7 +1455,7 @@ extern char * xstrdup (const char *s) { t = strdup (s); if (t == NULL) - fatalError(memory_exhausted); + error_msg_and_die(memory_exhausted); return t; } @@ -1453,7 +1467,7 @@ extern char * xstrndup (const char *s, int n) { char *t; if (s == NULL) - fatalError("xstrndup bug"); + error_msg_and_die("xstrndup bug"); t = xmalloc(n+1); strncpy(t,s,n); @@ -1475,7 +1489,11 @@ extern int vdprintf(int d, const char *format, va_list ap) } #endif /* BB_SYSLOGD */ + #if defined BB_FEATURE_MOUNT_LOOP +#include +#include "loop.h" /* Pull in loop device support */ + extern int del_loop(const char *device) { int fd; @@ -1570,13 +1588,13 @@ extern int find_real_root_device_name(char* name) char fileName[BUFSIZ]; if (stat("/", &rootStat) != 0) { - errorMsg("could not stat '/'\n"); + error_msg("could not stat '/'\n"); return( FALSE); } dir = opendir("/dev"); if (!dir) { - errorMsg("could not open '/dev'\n"); + error_msg("could not open '/dev'\n"); return( FALSE); } @@ -1623,8 +1641,8 @@ extern char *get_line_from_file(FILE *file) if (ch == EOF) break; /* grow the line buffer as necessary */ - if (idx > linebufsz-2) - linebuf = realloc(linebuf, linebufsz += GROWBY); + while (idx > linebufsz-2) + linebuf = xrealloc(linebuf, linebufsz += GROWBY); linebuf[idx++] = (char)ch; if ((char)ch == '\n') break; @@ -1637,7 +1655,7 @@ extern char *get_line_from_file(FILE *file) return linebuf; } -#if defined BB_CAT || defined BB_LSMOD +#if defined BB_CAT extern void print_file(FILE *file) { int c; @@ -1651,16 +1669,14 @@ extern void print_file(FILE *file) extern int print_file_by_name(char *filename) { FILE *file; - file = fopen(filename, "r"); - if (file == NULL) { + if ((file = wfopen(filename, "r")) == NULL) return FALSE; - } print_file(file); return TRUE; } -#endif /* BB_CAT || BB_LSMOD */ +#endif /* BB_CAT */ -#if defined BB_ECHO || defined BB_TR +#if defined BB_ECHO || defined BB_SH || defined BB_TR char process_escape_sequence(char **ptr) { char c; @@ -1678,6 +1694,9 @@ char process_escape_sequence(char **ptr) case 'n': c = '\n'; break; + case 'r': + c = '\r'; + break; case 't': c = '\t'; break; @@ -1705,7 +1724,7 @@ char process_escape_sequence(char **ptr) } #endif -#if defined BB_BASENAME || defined BB_LN +#if defined BB_BASENAME || defined BB_LN || defined BB_SH || defined BB_INIT || defined BB_FEATURE_USE_PROCFS char *get_last_path_component(char *path) { char *s=path+strlen(path)-1; @@ -1730,11 +1749,43 @@ void xregcomp(regex_t *preg, const char *regex, int cflags) int errmsgsz = regerror(ret, preg, NULL, 0); char *errmsg = xmalloc(errmsgsz); regerror(ret, preg, errmsg, errmsgsz); - fatalError("bb_regcomp: %s\n", errmsg); + error_msg_and_die("xregcomp: %s\n", errmsg); + } +} +#endif + +#if defined BB_CAT || defined BB_HEAD || defined BB_WC +FILE *wfopen(const char *path, const char *mode) +{ + FILE *fp; + if ((fp = fopen(path, mode)) == NULL) { + error_msg("%s: %s\n", path, strerror(errno)); + errno = 0; } + return fp; } #endif +#if defined BB_HOSTNAME || defined BB_LOADACM || defined BB_MORE \ + || defined BB_SED || defined BB_SH || defined BB_UNIQ \ + || defined BB_WC || defined BB_CMP +FILE *xfopen(const char *path, const char *mode) +{ + FILE *fp; + if ((fp = fopen(path, mode)) == NULL) + error_msg_and_die("%s: %s\n", path, strerror(errno)); + return fp; +} +#endif + +int applet_name_compare(const void *x, const void *y) +{ + const struct BB_applet *applet1 = x; + const struct BB_applet *applet2 = y; + + return strcmp(applet1->name, applet2->name); +} + /* END CODE */ /* Local Variables: