X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=utility.c;h=cbbc02f989fb7ae7c9ce4be0a0d8b7cbda037b2a;hb=f1f6d58598ae6628b6a31d512e9148674349ee98;hp=b33b3c0b4d8d20b632581a4e14775bf305397814;hpb=5afc864422e8c572a13b3e48df47fd0e56cfbb74;p=oweals%2Fbusybox.git diff --git a/utility.c b/utility.c index b33b3c0b4..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,15 +45,15 @@ #include #include #include -#include #include #include +#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 @@ -79,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", @@ -130,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 */ @@ -234,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; @@ -268,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; } @@ -306,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; @@ -798,16 +820,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, unsigned long id, unsigned long *gid) { FILE *file; char *rname, *start, *end, buf[128]; - id_t rid; - gid_t rgid = 0; + 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); } @@ -831,13 +854,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)) { @@ -858,33 +881,33 @@ 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) +unsigned 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) +unsigned 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, unsigned 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, unsigned long gid) { my_getid("/etc/group", group, gid, NULL); } /* gets a gid given a user name */ -gid_t my_getpwnamegid(char *name) +unsigned long my_getpwnamegid(char *name) { - gid_t gid; + unsigned long gid; my_getid("/etc/passwd", name, -1, &gid); return gid; } @@ -892,11 +915,12 @@ gid_t my_getpwnamegid(char *name) #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) { @@ -977,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) @@ -1056,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 @@ -1156,7 +1180,7 @@ extern int check_wildcard_match(const char *text, const char *pattern) return TRUE; } -#endif /* BB_FIND */ +#endif /* BB_FIND || BB_INSMOD */ @@ -1278,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 @@ -1318,7 +1342,7 @@ 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, NULL, 0); } } @@ -1428,10 +1452,40 @@ extern void *xmalloc(size_t size) void *cp = malloc(size); if (cp == NULL) - fatalError("out of memory\n"); + 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) { @@ -1529,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; @@ -1573,57 +1627,115 @@ extern int find_real_root_device_name(char* name) } #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 */ + 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 -/* - * wrapper around recursive cstring_alloc - * it's the caller's responsibility to free the cstring - */ -char * -cstring_lineFromFile(FILE *f) +#if defined BB_GREP || defined BB_SED +int bb_regcomp(regex_t *preg, const char *regex, int cflags) { - return cstring_alloc(f, 0); + 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 */ /*