X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=utility.c;h=62c47288561ee3a108bf6771f81dafdff0ac2d04;hb=46f44d24fcc25a5d6e13e0453485881bdf147e91;hp=11ee7c68017bae7cfe99fe7fa054b4ef6a948fca;hpb=7ab9c7ee52db8759d457819f5480378fa3aa97cc;p=oweals%2Fbusybox.git diff --git a/utility.c b/utility.c index 11ee7c680..62c472885 100644 --- a/utility.c +++ b/utility.c @@ -25,16 +25,19 @@ * */ -#include "internal.h" +#include "busybox.h" #if defined (BB_CHMOD_CHOWN_CHGRP) \ || defined (BB_CP_MV) \ || defined (BB_FIND) \ + || defined (BB_INSMOD) \ || defined (BB_LS) \ - || defined (BB_INSMOD) -/* same conditions as recursiveAction */ + || defined (BB_RM) \ + || defined (BB_TAR) +/* same conditions as recursive_action */ #define bb_need_name_too_long -#define bb_need_memory_exhausted #endif +#define bb_need_memory_exhausted +#define bb_need_full_version #define BB_DECLARE_EXTERN #include "messages.c" @@ -45,16 +48,10 @@ #include #include #include -#include #include #include -#include /* for uname(2) */ - -#if defined BB_FEATURE_MOUNT_LOOP -#include #include -#include -#endif +#include /* for uname(2) */ /* Busybox mount uses either /proc/filesystems or /dev/mtab to get the * list of available filesystems used for the -t auto option */ @@ -65,11 +62,11 @@ #if defined BB_MOUNT || defined BB_UMOUNT || defined BB_DF -# if defined BB_FEATURE_USE_PROCFS -const char mtab_file[] = "/proc/mounts"; -# else -# if defined BB_MTAB +# if defined BB_MTAB const char mtab_file[] = "/etc/mtab"; +# else +# if defined BB_FEATURE_USE_PROCFS +const char mtab_file[] = "/proc/mounts"; # else # if defined BB_FEATURE_USE_DEVPS_PATCH const char mtab_file[] = "/dev/mtab"; @@ -80,38 +77,72 @@ const char mtab_file[] = "/dev/mtab"; # endif #endif - extern void usage(const char *usage) { - fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n", - BB_VER, BB_BT); + 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) +{ + fflush(stdout); + fprintf(stderr, "%s: ", applet_name); + vfprintf(stderr, s, p); + fflush(stderr); +} + +extern void error_msg(const char *s, ...) { va_list p; va_start(p, s); - fflush(stdout); - vfprintf(stderr, s, p); + verror_msg(s, p); va_end(p); - fflush(stderr); } -extern void fatalError(const char *s, ...) +extern void error_msg_and_die(const char *s, ...) { va_list p; va_start(p, s); - fflush(stdout); - vfprintf(stderr, s, p); + 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); + 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 /* Returns kernel version encoded as major*65536 + minor*256 + patch, * so, for example, to check if the kernel is greater than 2.2.11: * if (get_kernel_revision() <= 2*65536+2*256+11) { } @@ -125,11 +156,44 @@ 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 */ + + + +#if defined BB_FREE || defined BB_INIT || defined BB_UNAME || defined BB_UPTIME +_syscall1(int, sysinfo, struct sysinfo *, info); +#endif /* BB_INIT */ + +#if defined BB_MOUNT || defined BB_UMOUNT + +#ifndef __NR_umount2 +#define __NR_umount2 52 +#endif + +/* Include our own version of , since libc5 doesn't + * know about umount2 */ +extern _syscall1(int, umount, const char *, special_file); +extern _syscall2(int, umount2, const char *, special_file, int, flags); +extern _syscall5(int, mount, const char *, special_file, const char *, dir, + const char *, fstype, unsigned long int, rwflag, const void *, data); +#endif + +#if defined BB_INSMOD || defined BB_LSMOD +#ifndef __NR_query_module +#define __NR_query_module 167 +#endif +_syscall5(int, query_module, const char *, name, int, which, + void *, buf, size_t, bufsize, size_t*, ret); +#endif +#if defined (BB_CP_MV) || defined (BB_DU) + #define HASH_SIZE 311 /* Should be prime */ #define hash_inode(i) ((i) % HASH_SIZE) @@ -195,12 +259,14 @@ void reset_ino_dev_hashtable(void) } } +#endif /* BB_CP_MV || BB_DU */ +#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; @@ -226,7 +292,32 @@ int isDirectory(const char *fileName, const int followLinks, struct stat *statBu } return status; } +#endif + +#if defined (BB_AR) || defined BB_CP_MV +/* + * Copy chunksize bytes between two file descriptors + */ +int copy_file_chunk(int srcfd, int dstfd, size_t chunksize) +{ + size_t size; + char buffer[BUFSIZ]; /* BUFSIZ is declared in stdio.h */ + + while (chunksize > 0) { + if (chunksize > BUFSIZ) + size = BUFSIZ; + else + size = chunksize; + if (full_write(dstfd, buffer, full_read(srcfd, buffer, size)) < size) + return(FALSE); + chunksize -= size; + } + return (TRUE); +} +#endif + +#if defined (BB_CP_MV) /* * Copy one file to another, while possibly preserving its modes, times, and * modes. Returns TRUE if successful, or FALSE on a failure with an error @@ -234,14 +325,12 @@ int isDirectory(const char *fileName, const int followLinks, struct stat *statBu * -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; int wfd; - int rcc; int status; - char buf[BUF_SIZE]; struct stat srcStatBuf; struct stat dstStatBuf; struct utimbuf times; @@ -269,7 +358,7 @@ copyFile(const char *srcName, const char *destName, if ((srcStatBuf.st_dev == dstStatBuf.st_dev) && (srcStatBuf.st_ino == dstStatBuf.st_ino)) { - fprintf(stderr, "Copying file \"%s\" to itself\n", srcName); + error_msg("Copying file \"%s\" to itself\n", srcName); return FALSE; } @@ -326,8 +415,7 @@ copyFile(const char *srcName, const char *destName, return FALSE; } - wfd = - open(destName, O_WRONLY | O_CREAT | O_TRUNC, + wfd = open(destName, O_WRONLY | O_CREAT | O_TRUNC, srcStatBuf.st_mode); if (wfd < 0) { perror(destName); @@ -335,14 +423,9 @@ copyFile(const char *srcName, const char *destName, return FALSE; } - while ((rcc = read(rfd, buf, sizeof(buf))) > 0) { - if (fullWrite(wfd, buf, rcc) < 0) - goto error_exit; - } - if (rcc < 0) { - goto error_exit; - } - + if (copy_file_chunk(rfd, wfd, srcStatBuf.st_size)==FALSE) + goto error_exit; + close(rfd); if (close(wfd) < 0) { return FALSE; @@ -353,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); } } @@ -376,9 +459,12 @@ copyFile(const char *srcName, const char *destName, return FALSE; } +#endif /* BB_CP_MV */ +#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)]) @@ -396,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]; @@ -420,13 +506,15 @@ const char *modeString(int mode) } return buf; } +#endif /* BB_TAR || BB_LS */ +#if defined BB_TAR || defined BB_AR /* * 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; @@ -446,13 +534,15 @@ const char *timeString(time_t timeVal) return buf; } +#endif /* BB_TAR || BB_AR */ +#if defined BB_TAR || defined BB_CP_MV || defined BB_AR /* * Write all of the supplied buffer out to a file. * 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; @@ -472,15 +562,17 @@ int fullWrite(int fd, const char *buf, int len) return total; } +#endif /* BB_TAR || BB_CP_MV || BB_AR */ +#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; @@ -503,19 +595,28 @@ int fullRead(int fd, char *buf, int len) return total; } +#endif /* BB_TAR || BB_TAIL || BB_AR || BB_SH */ + +#if defined (BB_CHMOD_CHOWN_CHGRP) \ + || defined (BB_CP_MV) \ + || defined (BB_FIND) \ + || defined (BB_INSMOD) \ + || defined (BB_LS) \ + || defined (BB_RM) \ + || defined (BB_TAR) /* * Walk down all the directories under the specified * 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, @@ -540,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; } @@ -565,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; } } @@ -583,28 +684,28 @@ int recursiveAction(const char *fileName, continue; } if (strlen(fileName) + strlen(next->d_name) + 1 > BUFSIZ) { - fprintf(stderr, name_too_long, "ftw"); + 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 < 0) { + if (status == FALSE) { closedir(dir); return FALSE; } } 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; } } @@ -617,16 +718,18 @@ int recursiveAction(const char *fileName, return TRUE; } +#endif /* BB_CHMOD_CHOWN_CHGRP || BB_CP_MV || BB_FIND || BB_LS || BB_INSMOD */ +#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; @@ -649,10 +752,16 @@ extern int createPath(const char *name, int mode) } return TRUE; } +#endif /* BB_TAR || BB_MKDIR */ +#if defined (BB_CHMOD_CHOWN_CHGRP) || defined (BB_MKDIR) \ + || defined (BB_MKFIFO) || defined (BB_MKNOD) || defined (BB_AR) /* [ugoa]{+|-|=}[rwxst] */ + + + extern int parse_mode(const char *s, mode_t * theMode) { mode_t andMode = @@ -664,6 +773,9 @@ extern int parse_mode(const char *s, mode_t * theMode) char type; char c; + if (s==NULL) + return (FALSE); + do { for (;;) { switch (c = *s++) { @@ -745,8 +857,16 @@ extern int parse_mode(const char *s, mode_t * theMode) } +#endif +/* BB_CHMOD_CHOWN_CHGRP || BB_MKDIR || BB_MKFIFO || BB_MKNOD */ + + + +#if defined BB_CHMOD_CHOWN_CHGRP || defined BB_PS || defined BB_LS \ + || defined BB_TAR || defined BB_ID || defined BB_LOGGER \ + || defined BB_LOGNAME || defined BB_WHOAMI /* This parses entries in /etc/passwd and /etc/group. This is desirable * for BusyBox, since we want to avoid using the glibc NSS stuff, which @@ -761,16 +881,17 @@ extern int parse_mode(const char *s, mode_t * theMode) * This uses buf as storage to hold things. * */ -uid_t my_getid(const char *filename, char *name, uid_t id, gid_t *gid) +unsigned long my_getid(const char *filename, char *name, long id, long *gid) { FILE *file; char *rname, *start, *end, buf[128]; - id_t rid; - gid_t rgid = 0; + long rid; + long rgid = 0; file = fopen(filename, "r"); if (file == NULL) { - perror(filename); + /* Do not complain. It is ok for /etc/passwd and + * friends to be missing... */ return (-1); } @@ -794,13 +915,13 @@ uid_t my_getid(const char *filename, char *name, uid_t id, gid_t *gid) /* uid in passwd, gid in group */ start = end + 1; - rid = (uid_t) strtol(start, &end, 10); + rid = (unsigned long) strtol(start, &end, 10); if (end == start) continue; /* gid in passwd */ start = end + 1; - rgid = (gid_t) strtol(start, &end, 10); + rgid = (unsigned long) strtol(start, &end, 10); if (name) { if (0 == strcmp(rname, name)) { @@ -821,41 +942,48 @@ uid_t my_getid(const char *filename, char *name, uid_t id, gid_t *gid) } /* returns a uid given a username */ -uid_t my_getpwnam(char *name) +long my_getpwnam(char *name) { return my_getid("/etc/passwd", name, -1, NULL); } /* returns a gid given a group name */ -gid_t my_getgrnam(char *name) +long my_getgrnam(char *name) { return my_getid("/etc/group", name, -1, NULL); } /* gets a username given a uid */ -void my_getpwuid(char *name, uid_t uid) +void my_getpwuid(char *name, long uid) { my_getid("/etc/passwd", name, uid, NULL); } /* gets a groupname given a gid */ -void my_getgrgid(char *group, gid_t gid) +void my_getgrgid(char *group, long gid) { my_getid("/etc/group", group, gid, NULL); } /* gets a gid given a user name */ -gid_t my_getpwnamegid(char *name) +long my_getpwnamegid(char *name) { - gid_t gid; + long gid; my_getid("/etc/passwd", name, -1, &gid); return gid; } +#endif + /* BB_CHMOD_CHOWN_CHGRP || BB_PS || BB_LS || BB_TAR \ + || BB_ID || BB_LOGGER || BB_LOGNAME || BB_WHOAMI */ -#include -#include +#if (defined BB_CHVT) || (defined BB_DEALLOCVT) || (defined BB_SETKEYCODES) + +/* From */ +#define KDGKBTYPE 0x4B33 /* get keyboard type */ +#define KB_84 0x01 +#define KB_101 0x02 /* this is what we always answer */ int is_a_console(int fd) { @@ -930,88 +1058,15 @@ int get_console_fd(char *tty_name) if (is_a_console(fd)) return fd; - fprintf(stderr, - "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 */ } +#endif /* BB_CHVT || BB_DEALLOCVT || BB_SETKEYCODES */ -#if !defined BB_REGEXP -/* Do a case insensitive strstr() */ -char *stristr(char *haystack, const char *needle) -{ - int len = strlen(needle); - - while (*haystack) { - if (!strncasecmp(haystack, needle, len)) - break; - haystack++; - } - - if (!(*haystack)) - haystack = NULL; - - return haystack; -} - -/* This tries to find a needle in a haystack, but does so by - * only trying to match literal strings (look 'ma, no regexps!) - * This is short, sweet, and carries _very_ little baggage, - * unlike its beefier cousin in regexp.c - * -Erik Andersen - */ -extern int find_match(char *haystack, char *needle, int ignoreCase) -{ - - if (ignoreCase == FALSE) - haystack = strstr(haystack, needle); - else - haystack = stristr(haystack, needle); - if (haystack == NULL) - return FALSE; - return TRUE; -} - - -/* This performs substitutions after a string match has been found. */ -extern int replace_match(char *haystack, char *needle, char *newNeedle, - int ignoreCase) -{ - int foundOne = 0; - char *where, *slider, *slider1, *oldhayStack; - - if (ignoreCase == FALSE) - where = strstr(haystack, needle); - else - where = stristr(haystack, needle); - - if (strcmp(needle, newNeedle) == 0) - return FALSE; - - oldhayStack = (char *) xmalloc((unsigned) (strlen(haystack))); - while (where != NULL) { - foundOne++; - strcpy(oldhayStack, haystack); - for (slider = haystack, slider1 = oldhayStack; slider != where; - slider++, slider1++); - *slider = 0; - haystack = strcat(haystack, newNeedle); - slider1 += strlen(needle); - haystack = strcat(haystack, slider1); - where = strstr(slider, needle); - } - free(oldhayStack); - - if (foundOne > 0) - return TRUE; - else - return FALSE; -} -#endif /* ! BB_REGEXP */ - - +#if defined BB_FIND || defined BB_INSMOD /* * Routine to see if a text string is matched by a wildcard pattern. * Returns TRUE if the text is matched, or FALSE if it is not matched @@ -1111,10 +1166,12 @@ extern int check_wildcard_match(const char *text, const char *pattern) return TRUE; } +#endif /* BB_FIND || BB_INSMOD */ +#if defined BB_DF || defined BB_MTAB /* * Given a block device, find the mount table entry if that block device * is mounted. @@ -1122,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; @@ -1153,23 +1210,25 @@ extern struct mntent *findMountPoint(const char *name, const char *table) endmntent(mountTable); return mountEntry; } +#endif /* BB_DF || BB_MTAB */ +#if defined BB_DD || defined BB_TAIL /* * 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++) { @@ -1202,8 +1261,10 @@ extern long getNum(const char *cp) return value; } +#endif /* BB_DD || BB_TAIL */ +#if defined BB_INIT || defined BB_SYSLOGD /* try to open up the specified device */ extern int device_open(char *device, int mode) { @@ -1222,19 +1283,23 @@ extern int device_open(char *device, int mode) fcntl(fd, F_SETFL, mode); return fd; } +#endif /* BB_INIT BB_SYSLOGD */ +#if defined BB_KILLALL || ( defined BB_FEATURE_LINUXRC && ( defined BB_HALT || defined BB_REBOOT || defined BB_POWEROFF )) #ifdef BB_FEATURE_USE_DEVPS_PATCH -#include +#include /* For Erik's nifty devps device driver */ +#endif -/* findPidByName() +#if defined BB_FEATURE_USE_DEVPS_PATCH +/* 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"; @@ -1245,31 +1310,31 @@ 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; 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; @@ -1342,41 +1403,82 @@ 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; } #endif /* BB_FEATURE_USE_DEVPS_PATCH */ +#endif /* BB_KILLALL || ( BB_FEATURE_LINUXRC && ( BB_HALT || BB_REBOOT || BB_POWEROFF )) */ +#ifndef DMALLOC /* this should really be farmed out to libbusybox.a */ extern void *xmalloc(size_t size) { - void *cp = malloc(size); + void *ptr = malloc(size); + + if (!ptr) + error_msg_and_die(memory_exhausted); + return ptr; +} + +extern void *xrealloc(void *old, size_t size) +{ + void *ptr = realloc(old, size); + if (!ptr) + error_msg_and_die(memory_exhausted); + return ptr; +} + +extern void *xcalloc(size_t nmemb, size_t size) +{ + void *ptr = calloc(nmemb, size); + if (!ptr) + error_msg_and_die(memory_exhausted); + return ptr; +} +#endif + +#if defined BB_FEATURE_NFSMOUNT || defined BB_LS || defined BB_SH || defined BB_WGET +# ifndef DMALLOC +extern char * xstrdup (const char *s) { + char *t; + + if (s == NULL) + return NULL; - if (cp == NULL) - fatalError(memory_exhausted, ""); - return cp; + t = strdup (s); + + if (t == NULL) + error_msg_and_die(memory_exhausted); + + return t; +} +# endif +#endif + +#if defined BB_FEATURE_NFSMOUNT +extern char * xstrndup (const char *s, int n) { + char *t; + + if (s == NULL) + error_msg_and_die("xstrndup bug"); + + t = xmalloc(n+1); + strncpy(t,s,n); + t[n] = 0; + + return t; } +#endif -#if (__GLIBC__ < 2) + +#if (__GLIBC__ < 2) && (defined BB_SYSLOGD || defined BB_INIT) extern int vdprintf(int d, const char *format, va_list ap) { char buf[BUF_SIZE]; @@ -1385,7 +1487,12 @@ extern int vdprintf(int d, const char *format, va_list ap) len = vsprintf(buf, format, ap); return write(d, buf, len); } -#endif +#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) { @@ -1470,7 +1577,9 @@ extern char *find_unused_loop_device(void) } return NULL; } +#endif /* BB_FEATURE_MOUNT_LOOP */ +#if defined BB_MOUNT || defined BB_DF || ( defined BB_UMOUNT && ! defined BB_MTAB) extern int find_real_root_device_name(char* name) { DIR *dir; @@ -1479,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); } @@ -1496,7 +1605,7 @@ extern int find_real_root_device_name(char* name) if (strcmp(entry->d_name, "..") == 0) continue; - sprintf( fileName, "/dev/%s", entry->d_name); + snprintf( fileName, strlen(name)+1, "/dev/%s", entry->d_name); if (stat(fileName, &statBuf) != 0) continue; @@ -1512,57 +1621,169 @@ extern int find_real_root_device_name(char* name) return( FALSE); } +#endif -const unsigned int CSTRING_BUFFER_LENGTH = 128; -/* recursive parser that returns cstrings of arbitrary length - * from a FILE* - */ -static char * -cstring_alloc(FILE* f, int depth) + +/* get_line_from_file() - This function reads an entire line from a text file + * up to a newline. It returns a malloc'ed char * which must be stored and + * free'ed by the caller. */ +extern char *get_line_from_file(FILE *file) { - char *cstring; - char buffer[CSTRING_BUFFER_LENGTH]; - int target = CSTRING_BUFFER_LENGTH * depth; - int i, len; - int size; - - /* fill buffer */ - i = 0; - while ((buffer[i] = fgetc(f)) != EOF) { - if (buffer[i++] == 0x0a) { break; } - if (i == CSTRING_BUFFER_LENGTH) { break; } - } - len = i; - - /* recurse or malloc? */ - if (len == CSTRING_BUFFER_LENGTH) { - cstring = cstring_alloc(f, (depth + 1)); - } else { - /* [special case] EOF */ - if ((depth | len) == 0) { return NULL; } - - /* malloc */ - size = target + len + 1; - cstring = malloc(size); - if (!cstring) { return NULL; } - cstring[size - 1] = 0; - } - - /* copy buffer */ - if (cstring) { - memcpy(&cstring[target], buffer, len); - } - return cstring; + static const int GROWBY = 80; /* how large we will grow strings by */ + + int ch; + int idx = 0; + char *linebuf = NULL; + int linebufsz = 0; + + while (1) { + ch = fgetc(file); + if (ch == EOF) + break; + /* grow the line buffer as necessary */ + while (idx > linebufsz-2) + linebuf = xrealloc(linebuf, linebufsz += GROWBY); + linebuf[idx++] = (char)ch; + if ((char)ch == '\n') + break; + } + + if (idx == 0) + return NULL; + + linebuf[idx] = 0; + return linebuf; } -/* - * wrapper around recursive cstring_alloc - * it's the caller's responsibility to free the cstring - */ -char * -cstring_lineFromFile(FILE *f) +#if defined BB_CAT +extern void print_file(FILE *file) { - return cstring_alloc(f, 0); + int c; + + while ((c = getc(file)) != EOF) + putc(c, stdout); + fclose(file); + fflush(stdout); +} + +extern int print_file_by_name(char *filename) +{ + FILE *file; + if ((file = wfopen(filename, "r")) == NULL) + return FALSE; + print_file(file); + return TRUE; +} +#endif /* BB_CAT */ + +#if defined BB_ECHO || defined BB_SH || defined BB_TR +char process_escape_sequence(char **ptr) +{ + char c; + + switch (c = *(*ptr)++) { + case 'a': + c = '\a'; + break; + case 'b': + c = '\b'; + break; + case 'f': + c = '\f'; + break; + case 'n': + c = '\n'; + break; + case 'r': + c = '\r'; + break; + case 't': + c = '\t'; + break; + case 'v': + c = '\v'; + break; + case '\\': + c = '\\'; + break; + case '0': case '1': case '2': case '3': + case '4': case '5': case '6': case '7': + c -= '0'; + if ('0' <= **ptr && **ptr <= '7') { + c = c * 8 + (*(*ptr)++ - '0'); + if ('0' <= **ptr && **ptr <= '7') + c = c * 8 + (*(*ptr)++ - '0'); + } + break; + default: + (*ptr)--; + c = '\\'; + break; + } + return c; +} +#endif + +#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; + + /* strip trailing slashes */ + while (s && *s == '/') { + *s-- = '\0'; + } + + /* find last component */ + s = strrchr(path, '/'); + if (s==NULL) return path; + else return s+1; +} +#endif + +#if defined BB_GREP || defined BB_SED +void xregcomp(regex_t *preg, const char *regex, int cflags) +{ + int ret; + if ((ret = regcomp(preg, regex, cflags)) != 0) { + int errmsgsz = regerror(ret, preg, NULL, 0); + char *errmsg = xmalloc(errmsgsz); + regerror(ret, preg, errmsg, errmsgsz); + 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 */