X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=utility.c;h=cbbc02f989fb7ae7c9ce4be0a0d8b7cbda037b2a;hb=f1f6d58598ae6628b6a31d512e9148674349ee98;hp=0d4799f2db5d71fbab26505b66ffad2f2522f51d;hpb=3364d78b18386623e7af5da18ba1bb0cc6286279;p=oweals%2Fbusybox.git diff --git a/utility.c b/utility.c index 0d4799f2d..cbbc02f98 100644 --- a/utility.c +++ b/utility.c @@ -34,6 +34,7 @@ /* same conditions as recursiveAction */ #define bb_need_name_too_long #endif +#define bb_need_memory_exhausted #define BB_DECLARE_EXTERN #include "messages.c" @@ -44,16 +45,15 @@ #include #include #include -#include #include #include -#include /* for PATH_MAX */ +#include +#include #include /* for uname(2) */ #if defined BB_FEATURE_MOUNT_LOOP #include -#include -#include +#include /* Pull in loop device support */ #endif /* Busybox mount uses either /proc/filesystems or /dev/mtab to get the @@ -80,7 +80,6 @@ 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", @@ -131,6 +130,30 @@ extern int get_kernel_revision(void) } #endif /* BB_INIT */ + + +#if defined BB_FREE || defined BB_INIT || defined BB_UNAME || defined BB_UPTIME +#include +_syscall1(int, sysinfo, struct sysinfo *, info); +#endif /* BB_INIT */ + +#if defined BB_MOUNT || defined BB_UMOUNT +#include + +#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_CP_MV) || defined (BB_DU) #define HASH_SIZE 311 /* Should be prime */ @@ -235,15 +258,14 @@ int isDirectory(const char *fileName, const int followLinks, struct stat *statBu #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) + int setModes, int followLinks, int forceFlag) { int rfd; int wfd; @@ -269,7 +291,8 @@ 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; } @@ -289,12 +312,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; @@ -307,10 +330,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; @@ -525,10 +546,12 @@ int fullRead(int fd, char *buf, int len) #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_RM) \ + || defined (BB_TAR) + /* * Walk down all the directories under the specified * location, and do something (something specified @@ -600,16 +623,17 @@ int recursiveAction(const char *fileName, } } 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) { + if (strlen(fileName) + strlen(next->d_name) + 1 > BUFSIZ) { fprintf(stderr, name_too_long, "ftw"); return FALSE; } + memset(nextFile, 0, sizeof(nextFile)); sprintf(nextFile, "%s/%s", fileName, next->d_name); status = recursiveAction(nextFile, TRUE, followLinks, depthFirst, @@ -655,7 +679,7 @@ extern int createPath(const char *name, int mode) { char *cp; char *cpOld; - char buf[PATH_MAX + 1]; + char buf[BUFSIZ + 1]; int retVal = 0; strcpy(buf, name); @@ -781,22 +805,32 @@ extern int parse_mode(const char *s, mode_t * theMode) +#if defined BB_CHMOD_CHOWN_CHGRP || defined BB_PS || defined BB_LS || defined BB_TAR || defined BB_ID - -#if defined (BB_CHMOD_CHOWN_CHGRP) || defined (BB_PS) - -/* 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, unsigned long id, unsigned long *gid) { FILE *file; char *rname, *start, *end, buf[128]; - uid_t rid; + unsigned long rid; + unsigned 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); } @@ -804,6 +838,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) @@ -811,24 +846,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); } @@ -837,37 +880,47 @@ 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 */ +unsigned 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 */ +unsigned 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, unsigned 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, unsigned long gid) { - my_getid("/etc/group", group, gid); + my_getid("/etc/group", group, gid, NULL); } +/* gets a gid given a user name */ +unsigned long my_getpwnamegid(char *name) +{ + unsigned 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 */ -#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) { @@ -948,7 +1001,7 @@ int get_console_fd(char *tty_name) } -#endif /* BB_CHVT || BB_DEALLOCVT */ +#endif /* BB_CHVT || BB_DEALLOCVT || BB_SETKEYCODES */ #if !defined BB_REGEXP && (defined BB_GREP || defined BB_SED) @@ -1008,15 +1061,6 @@ extern int replace_match(char *haystack, char *needle, char *newNeedle, 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; @@ -1036,7 +1080,7 @@ extern int replace_match(char *haystack, char *needle, char *newNeedle, #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 @@ -1057,6 +1101,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; @@ -1083,11 +1128,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 */ @@ -1128,7 +1180,7 @@ extern int check_wildcard_match(const char *text, const char *pattern) return TRUE; } -#endif /* BB_FIND */ +#endif /* BB_FIND || BB_INSMOD */ @@ -1250,7 +1302,7 @@ extern int device_open(char *device, int mode) #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 #if defined BB_FEATURE_USE_DEVPS_PATCH @@ -1259,17 +1311,15 @@ extern int device_open(char *device, int mode) * 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* findPidByName( 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); @@ -1292,18 +1342,32 @@ extern pid_t findPidByName( char* pidName) fatalError( "\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 */ + /* Now open the status file */ sprintf(filename, "/proc/%s/status", next->d_name); status = fopen(filename, "r"); if (!status) { @@ -1356,11 +1421,27 @@ extern pid_t findPidByName( char* pidName) fgets(buffer, 256, status); fclose(status); - if ((strstr(buffer, pidName) != NULL)) { - return strtol(next->d_name, NULL, 0); + /* 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, ""); + pidList[i++]=strtol(next->d_name, NULL, 0); } } - return 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 )) */ @@ -1371,10 +1452,40 @@ extern void *xmalloc(size_t size) void *cp = malloc(size); if (cp == NULL) - fatalError("out of memory"); + fatalError(memory_exhausted, ""); return cp; } +#if defined BB_FEATURE_NFSMOUNT +extern char * xstrdup (const char *s) { + char *t; + + if (s == NULL) + return NULL; + + t = strdup (s); + + if (t == NULL) + fatalError(memory_exhausted, ""); + + return t; +} + +extern char * xstrndup (const char *s, int n) { + char *t; + + if (s == NULL) + fatalError("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) { @@ -1472,7 +1583,7 @@ extern char *find_unused_loop_device(void) } #endif /* BB_FEATURE_MOUNT_LOOP */ -#if defined BB_MOUNT || defined BB_DF +#if defined BB_MOUNT || defined BB_DF || ( defined BB_UMOUNT && ! defined BB_MTAB) extern int find_real_root_device_name(char* name) { DIR *dir; @@ -1517,6 +1628,115 @@ extern int find_real_root_device_name(char* name) #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 */ + if (idx > linebufsz-2) + linebuf = realloc(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_ECHO || 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 '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 +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 +int bb_regcomp(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); + errorMsg("bb_regcomp: %s\n", errmsg); + free(errmsg); + regfree(preg); + } + return ret; +} +#endif + /* END CODE */ /* Local Variables: