X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=utility.c;h=62c47288561ee3a108bf6771f81dafdff0ac2d04;hb=46f44d24fcc25a5d6e13e0453485881bdf147e91;hp=c3f9947c51e0f0175de84cdf2f2a16b2f23bf03b;hpb=2ac2fae728cca8a535b29bdd2fa6899e6f4992f2;p=oweals%2Fbusybox.git diff --git a/utility.c b/utility.c index c3f9947c5..62c472885 100644 --- a/utility.c +++ b/utility.c @@ -25,15 +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 #endif +#define bb_need_memory_exhausted +#define bb_need_full_version #define BB_DECLARE_EXTERN #include "messages.c" @@ -44,80 +48,106 @@ #include #include #include -#include #include #include -#include /* for PATH_MAX */ -#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 */ -#if defined BB_FEATURE_USE_PROCFS && defined BB_FEATURE_USE_DEVPS_N_DEVMTAB +#if defined BB_FEATURE_USE_PROCFS && defined BB_FEATURE_USE_DEVPS_PATCH //#error Sorry, but busybox can't use both /proc and /dev/ps at the same time -- Pick one and try again. #error "Sorry, but busybox can't use both /proc and /dev/ps at the same time -- Pick one and try again." #endif #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_N_DEVMTAB +# if defined BB_FEATURE_USE_DEVPS_PATCH const char mtab_file[] = "/dev/mtab"; # else -# error With (BB_MOUNT||BB_UMOUNT||BB_DF) defined, you must define either BB_MTAB or ( BB_FEATURE_USE_PROCFS | BB_FEATURE_USE_DEVPS_N_DEVMTAB) +# error With (BB_MOUNT||BB_UMOUNT||BB_DF) defined, you must define either BB_MTAB or ( BB_FEATURE_USE_PROCFS | BB_FEATURE_USE_DEVPS_PATCH) # endif # endif # 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); +} + +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 errorMsg(char *s, ...) +extern void error_msg(const char *s, ...) { va_list p; va_start(p, s); - fflush(stdout); - vfprintf(stderr, s, p); - fprintf(stderr, "\n"); + verror_msg(s, p); va_end(p); } -extern void fatalError(char *s, ...) +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); - vfprintf(stderr, s, p); - fprintf(stderr, "\n"); + fprintf(stderr, "%s: ", applet_name); + if (s && *s) { + vfprintf(stderr, s, p); + fputs(": ", stderr); + } + fprintf(stderr, "%s\n", strerror(errno)); + fflush(stderr); +} + +extern void perror_msg(const char *s, ...) +{ + va_list p; + + va_start(p, s); + vperror_msg(s, p); va_end(p); - exit( FALSE); } -#if defined (BB_INIT) || defined (BB_PS) +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) { } + * if (get_kernel_revision() <= 2*65536+2*256+11) { } */ -int get_kernel_revision() +extern int get_kernel_revision(void) { struct utsname name; int major = 0, minor = 0, patch = 0; @@ -126,10 +156,41 @@ int get_kernel_revision() 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 || BB_PS */ +#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) @@ -172,9 +233,7 @@ void add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name) i = hash_inode(statbuf->st_ino); s = name ? strlen(name) : 0; - bucket = malloc(sizeof(ino_dev_hashtable_bucket_t) + s); - if (bucket == NULL) - fatalError("Not enough memory."); + bucket = xmalloc(sizeof(ino_dev_hashtable_bucket_t) + s); bucket->ino = statbuf->st_ino; bucket->dev = statbuf->st_dev; if (name) @@ -202,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; @@ -235,23 +294,43 @@ int isDirectory(const char *fileName, const int followLinks, struct stat *statBu } #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 message output. (Failure is not indicated if the attributes cannot - * be set.) - * -Erik Andersen + * 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 + * message output. (Failure is not indicated if attributes cannot be set.) + * -Erik Andersen */ int -copyFile(const char *srcName, const char *destName, - int setModes, int followLinks) +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; @@ -271,14 +350,15 @@ copyFile(const char *srcName, const char *destName, else status = lstat(destName, &dstStatBuf); - if (status < 0) { + if (status < 0 || forceFlag==TRUE) { + unlink(destName); dstStatBuf.st_ino = -1; dstStatBuf.st_dev = -1; } 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; } @@ -291,12 +371,12 @@ copyFile(const char *srcName, const char *destName, return FALSE; } } else if (S_ISLNK(srcStatBuf.st_mode)) { - char link_val[PATH_MAX + 1]; + char link_val[BUFSIZ + 1]; int link_size; //fprintf(stderr, "copying link %s to %s\n", srcName, destName); - /* Warning: This could possibly truncate silently, to PATH_MAX chars */ - link_size = readlink(srcName, &link_val[0], PATH_MAX); + /* Warning: This could possibly truncate silently, to BUFSIZ chars */ + link_size = readlink(srcName, &link_val[0], BUFSIZ); if (link_size < 0) { perror(srcName); return FALSE; @@ -309,10 +389,8 @@ copyFile(const char *srcName, const char *destName, } #if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) if (setModes == TRUE) { - if (lchown(destName, srcStatBuf.st_uid, srcStatBuf.st_gid) < 0) { - perror(destName); - return FALSE; - } + /* Try to set owner, but fail silently like GNU cp */ + lchown(destName, srcStatBuf.st_uid, srcStatBuf.st_gid); } #endif return TRUE; @@ -337,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); @@ -346,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; @@ -364,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); } } @@ -391,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)]) @@ -410,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]; @@ -437,12 +509,12 @@ const char *modeString(int mode) #endif /* BB_TAR || BB_LS */ -#if defined BB_TAR +#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; @@ -462,15 +534,15 @@ const char *timeString(time_t timeVal) return buf; } -#endif /* BB_TAR */ +#endif /* BB_TAR || BB_AR */ -#if defined BB_TAR || defined BB_CP_MV +#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; @@ -490,17 +562,17 @@ int fullWrite(int fd, const char *buf, int len) return total; } -#endif /* BB_TAR || BB_CP_MV */ +#endif /* BB_TAR || BB_CP_MV || BB_AR */ -#if defined BB_TAR || defined BB_TAIL +#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; @@ -523,30 +595,36 @@ int fullRead(int fd, char *buf, int len) return total; } -#endif /* BB_TAR || BB_TAIL */ +#endif /* BB_TAR || BB_TAIL || BB_AR || BB_SH */ #if defined (BB_CHMOD_CHOWN_CHGRP) \ - || defined (BB_CP_MV) \ - || defined (BB_FIND) \ - || defined (BB_LS) \ - || defined (BB_INSMOD) + || 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), + struct stat * statbuf, + void* userData), int (*dirAction) (const char *fileName, - struct stat * statbuf)) + struct stat * statbuf, + void* userData), + void* userData) { int status; struct stat statbuf; @@ -563,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; } @@ -571,13 +649,13 @@ int recursiveAction(const char *fileName, if (fileAction == NULL) return TRUE; else - return fileAction(fileName, &statbuf); + return fileAction(fileName, &statbuf, userData); } if (recurse == FALSE) { if (S_ISDIR(statbuf.st_mode)) { if (dirAction != NULL) - return (dirAction(fileName, &statbuf)); + return (dirAction(fileName, &statbuf, userData)); else return TRUE; } @@ -588,45 +666,46 @@ 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); + status = dirAction(fileName, &statbuf, userData); if (status == FALSE) { - perror(fileName); + perror_msg("%s", fileName); return FALSE; } } while ((next = readdir(dir)) != NULL) { - char nextFile[PATH_MAX + 1]; + char nextFile[BUFSIZ + 1]; if ((strcmp(next->d_name, "..") == 0) || (strcmp(next->d_name, ".") == 0)) { continue; } - if (strlen(fileName) + strlen(next->d_name) + 1 > PATH_MAX) { - fprintf(stderr, name_too_long, "ftw"); + if (strlen(fileName) + strlen(next->d_name) + 1 > BUFSIZ) { + 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, - fileAction, dirAction); - if (status < 0) { + recursive_action(nextFile, TRUE, followLinks, depthFirst, + fileAction, dirAction, userData); + 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); + status = dirAction(fileName, &statbuf, userData); if (status == FALSE) { - perror(fileName); + perror_msg("%s", fileName); return FALSE; } } @@ -634,7 +713,7 @@ int recursiveAction(const char *fileName, if (fileAction == NULL) return TRUE; else - return fileAction(fileName, &statbuf); + return fileAction(fileName, &statbuf, userData); } return TRUE; } @@ -643,18 +722,18 @@ 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; - char buf[PATH_MAX + 1]; + char buf[BUFSIZ + 1]; int retVal = 0; strcpy(buf, name); @@ -677,7 +756,8 @@ extern int createPath(const char *name, int mode) -#if defined (BB_CHMOD_CHOWN_CHGRP) || defined (BB_MKDIR) +#if defined (BB_CHMOD_CHOWN_CHGRP) || defined (BB_MKDIR) \ + || defined (BB_MKFIFO) || defined (BB_MKNOD) || defined (BB_AR) /* [ugoa]{+|-|=}[rwxst] */ @@ -693,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++) { @@ -774,28 +857,41 @@ extern int parse_mode(const char *s, mode_t * theMode) } -#endif /* BB_CHMOD_CHOWN_CHGRP || BB_MKDIR */ - - +#endif +/* BB_CHMOD_CHOWN_CHGRP || BB_MKDIR || BB_MKFIFO || BB_MKNOD */ -#if defined (BB_CHMOD_CHOWN_CHGRP) || defined (BB_PS) +#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 -/* Use this to avoid needing the glibc NSS stuff - * This uses storage buf to hold things. - * */ -uid_t my_getid(const char *filename, char *name, uid_t id) +/* 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 + * increases target size and is often not needed or wanted for embedded + * systems. + * + * /etc/passwd entries look like this: + * root:x:0:0:root:/root:/bin/bash + * and /etc/group entries look like this: + * root:x:0: + * + * This uses buf as storage to hold things. + * + */ +unsigned long my_getid(const char *filename, char *name, long id, long *gid) { FILE *file; char *rname, *start, *end, buf[128]; - uid_t rid; + 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); } @@ -803,6 +899,7 @@ uid_t my_getid(const char *filename, char *name, uid_t id) if (buf[0] == '#') continue; + /* username/group name */ start = buf; end = strchr(start, ':'); if (end == NULL) @@ -810,24 +907,32 @@ uid_t my_getid(const char *filename, char *name, uid_t id) *end = '\0'; rname = start; + /* password */ start = end + 1; end = strchr(start, ':'); if (end == NULL) continue; + /* 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 = (unsigned long) strtol(start, &end, 10); + if (name) { if (0 == strcmp(rname, name)) { + if (gid) *gid = rgid; fclose(file); return (rid); } } if (id != -1 && id == rid) { strncpy(name, rname, 8); + if (gid) *gid = rgid; fclose(file); return (TRUE); } @@ -836,37 +941,49 @@ uid_t my_getid(const char *filename, char *name, uid_t id) return (-1); } -uid_t my_getpwnam(char *name) +/* returns a uid given a username */ +long my_getpwnam(char *name) { - return my_getid("/etc/passwd", name, -1); + return my_getid("/etc/passwd", name, -1, NULL); } -gid_t my_getgrnam(char *name) +/* returns a gid given a group name */ +long my_getgrnam(char *name) { - return my_getid("/etc/group", name, -1); + return my_getid("/etc/group", name, -1, NULL); } -void my_getpwuid(char *name, uid_t uid) +/* gets a username given a uid */ +void my_getpwuid(char *name, long uid) { - my_getid("/etc/passwd", name, uid); + my_getid("/etc/passwd", name, uid, NULL); } -void my_getgrgid(char *group, gid_t gid) +/* gets a groupname given a gid */ +void my_getgrgid(char *group, long gid) { - my_getid("/etc/group", group, gid); + my_getid("/etc/group", group, gid, NULL); } +/* gets a gid given a user name */ +long my_getpwnamegid(char *name) +{ + long gid; + my_getid("/etc/passwd", name, -1, &gid); + return gid; +} -#endif /* BB_CHMOD_CHOWN_CHGRP || BB_PS */ - - - +#endif + /* BB_CHMOD_CHOWN_CHGRP || BB_PS || BB_LS || BB_TAR \ + || BB_ID || BB_LOGGER || BB_LOGNAME || BB_WHOAMI */ -#if (defined BB_CHVT) || (defined BB_DEALLOCVT) +#if (defined BB_CHVT) || (defined BB_DEALLOCVT) || (defined BB_SETKEYCODES) -#include -#include +/* 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) { @@ -941,101 +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 */ - - -#if !defined BB_REGEXP && (defined BB_GREP || defined BB_SED) - -/* 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; +#endif /* BB_CHVT || BB_DEALLOCVT || BB_SETKEYCODES */ - oldhayStack = (char *) malloc((unsigned) (strlen(haystack))); - while (where != NULL) { - foundOne++; - strcpy(oldhayStack, haystack); -#if 0 - if (strlen(newNeedle) > strlen(needle)) { - haystack = - (char *) realloc(haystack, - (unsigned) (strlen(haystack) - - strlen(needle) + - strlen(newNeedle))); - } -#endif - 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 && (BB_GREP || BB_SED) */ - - -#if defined BB_FIND +#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 @@ -1056,6 +1087,7 @@ extern int check_wildcard_match(const char *text, const char *pattern) const char *retryText; int ch; int found; + int len; retryPat = NULL; retryText = NULL; @@ -1082,11 +1114,18 @@ extern int check_wildcard_match(const char *text, const char *pattern) if (*text == ch) found = TRUE; } - - //if (!found) + len=strlen(text); + if (found == FALSE && len!=0) { + return FALSE; + } if (found == TRUE) { - pattern = retryPat; - text = ++retryText; + if (strlen(pattern)==0 && len==1) { + return TRUE; + } + if (len!=0) { + text++; + continue; + } } /* fall into next case */ @@ -1127,7 +1166,7 @@ extern int check_wildcard_match(const char *text, const char *pattern) return TRUE; } -#endif /* BB_FIND */ +#endif /* BB_FIND || BB_INSMOD */ @@ -1140,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; @@ -1180,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++) { @@ -1225,7 +1264,7 @@ extern long getNum(const char *cp) #endif /* BB_DD || BB_TAIL */ -#if defined BB_INIT || defined BB_SYSLOGD +#if defined BB_INIT || defined BB_SYSLOGD /* try to open up the specified device */ extern int device_open(char *device, int mode) { @@ -1247,96 +1286,105 @@ extern int device_open(char *device, int mode) #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_N_DEVMTAB -#include +#if defined BB_KILLALL || ( defined BB_FEATURE_LINUXRC && ( defined BB_HALT || defined BB_REBOOT || defined BB_POWEROFF )) +#ifdef BB_FEATURE_USE_DEVPS_PATCH +#include /* For Erik's nifty devps device driver */ #endif -#if defined BB_FEATURE_USE_DEVPS_N_DEVMTAB -/* 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. * - * [return] - * 0 failure - * pid when the pid is found. + * 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; + int fd, i, j; char device[] = "/dev/ps"; - pid_t thePid = 0; pid_t num_pids; pid_t* pid_array = NULL; + pid_t* pidList=NULL; /* 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 command line file */ - sprintf(filename, "/proc/%s/status", next->d_name); + sprintf(filename, "/proc/%s/cmdline", next->d_name); status = fopen(filename, "r"); if (!status) { continue; @@ -1356,30 +1403,80 @@ extern pid_t findPidByName( char* pidName) fgets(buffer, 256, status); fclose(status); - if ((strstr(buffer, pidName) != NULL)) { - return strtol(next->d_name, NULL, 0); + 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); } } - return 0; + + if (pidList) + pidList[i]=0; + return pidList; } -#endif /* BB_FEATURE_USE_DEVPS_N_DEVMTAB */ -#endif /* BB_INIT || BB_HALT || BB_REBOOT || BB_KILLALL || BB_POWEROFF */ +#endif /* BB_FEATURE_USE_DEVPS_PATCH */ +#endif /* BB_KILLALL || ( BB_FEATURE_LINUXRC && ( BB_HALT || BB_REBOOT || BB_POWEROFF )) */ -#if defined BB_GUNZIP \ - || defined BB_GZIP \ - || defined BB_PRINTF \ - || defined BB_TAIL +#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 (cp == NULL) { - errorMsg("out of memory"); - } - return cp; + if (!ptr) + error_msg_and_die(memory_exhausted); + return ptr; } -#endif /* BB_GUNZIP || BB_GZIP || BB_PRINTF || BB_TAIL */ +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; + + 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) && (defined BB_SYSLOGD || defined BB_INIT) extern int vdprintf(int d, const char *format, va_list ap) @@ -1392,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; @@ -1478,19 +1579,213 @@ extern char *find_unused_loop_device(void) } #endif /* BB_FEATURE_MOUNT_LOOP */ -#if defined BB_MTAB -#define whine_if_fstab_is_missing() {} -#else -extern void whine_if_fstab_is_missing() +#if defined BB_MOUNT || defined BB_DF || ( defined BB_UMOUNT && ! defined BB_MTAB) +extern int find_real_root_device_name(char* name) { - struct stat statBuf; + DIR *dir; + struct dirent *entry; + struct stat statBuf, rootStat; + char fileName[BUFSIZ]; - if (stat("/etc/fstab", &statBuf) < 0) - fprintf(stderr, - "/etc/fstab file missing -- install one to name /dev/root.\n\n"); + if (stat("/", &rootStat) != 0) { + error_msg("could not stat '/'\n"); + return( FALSE); + } + + dir = opendir("/dev"); + if (!dir) { + error_msg("could not open '/dev'\n"); + return( FALSE); + } + + while((entry = readdir(dir)) != NULL) { + + /* Must skip ".." since that is "/", and so we + * would get a false positive on ".." */ + if (strcmp(entry->d_name, "..") == 0) + continue; + + snprintf( fileName, strlen(name)+1, "/dev/%s", entry->d_name); + + if (stat(fileName, &statBuf) != 0) + continue; + /* Some char devices have the same dev_t as block + * devices, so make sure this is a block device */ + if (! S_ISBLK(statBuf.st_mode)) + continue; + if (statBuf.st_rdev == rootStat.st_rdev) { + strcpy(name, fileName); + return ( TRUE); + } + } + + return( FALSE); } #endif + +/* 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) +{ + 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; +} + +#if defined BB_CAT +extern void print_file(FILE *file) +{ + 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 */ /* Local Variables: