diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/functions.c | 112 | ||||
| -rw-r--r-- | lib/getmountlist.c | 15 | ||||
| -rw-r--r-- | lib/lib.h | 21 |
3 files changed, 137 insertions, 11 deletions
diff --git a/lib/functions.c b/lib/functions.c index 7ef3a70c..e01053ba 100644 --- a/lib/functions.c +++ b/lib/functions.c @@ -5,19 +5,59 @@ * succeed or kill the program with an error message, but never return failure. * They usually have the same arguments and return value as the function they * wrap. + * + * Copyright 2006 Rob Landley <rob@landley.net> */ #include "toys.h" +void verror_msg(char *msg, int err, va_list va) +{ + fprintf(stderr, "%s: ", toys.which->name); + vfprintf(stderr, msg, va); + if (err) fprintf(stderr, ": %s", strerror(err)); + putc('\n', stderr); +} + +void error_msg(char *msg, ...) +{ + va_list va; + + va_start(va, msg); + verror_msg(msg, 0, va); + va_end(va); +} + +void perror_msg(char *msg, ...) +{ + va_list va; + + va_start(va, msg); + verror_msg(msg, errno, va); + va_end(va); +} + // Die with an error message. void error_exit(char *msg, ...) { - va_list args; + va_list va; + + va_start(va, msg); + verror_msg(msg, 0, va); + va_end(va); + + exit(toys.exitval); +} + +// Die with an error message and strerror(errno) +void perror_exit(char *msg, ...) +{ + va_list va; + + va_start(va, msg); + verror_msg(msg, errno, va); + va_end(va); - va_start(args, msg); - fprintf(stderr, "%s: ", toys.which->name); - vfprintf(stderr, msg, args); - va_end(args); exit(toys.exitval); } @@ -87,7 +127,7 @@ char *xmsprintf(char *format, ...) // Die unless we can exec argv[] (or run builtin command). Note that anything // with a path isn't a builtin, so /bin/sh won't match the builtin sh. -void *xexec(char **argv) +void xexec(char **argv) { toy_exec(argv); execvp(argv[0], argv); @@ -118,6 +158,8 @@ char *xgetcwd(void) { char *buf = getcwd(NULL, 0); if (!buf) error_exit("xgetcwd"); + + return buf; } // Find this file in a colon-separated path. @@ -126,7 +168,7 @@ char *find_in_path(char *path, char *filename) { char *next, *res = NULL, *cwd = xgetcwd(); - while (next = index(path,':')) { + while ((next = index(path,':'))) { int len = next-path; if (len==1) res = xmsprintf("%s/%s", cwd, filename); @@ -144,3 +186,59 @@ char *find_in_path(char *path, char *filename) return res; } + +// Convert unsigned int to ascii, writing into supplied buffer. A truncated +// result contains the first few digits of the result ala strncpy, and is +// always null terminated (unless buflen is 0). +void utoa_to_buf(unsigned n, char *buf, unsigned buflen) +{ + int i, out = 0; + + if (buflen) { + for (i=1000000000; i; i/=10) { + int res = n/i; + + if ((res || out || i == 1) && --buflen>0) { + out++; + n -= res*i; + *buf++ = '0' + res; + } + } + *buf = 0; + } +} + +// Convert signed integer to ascii, using utoa_to_buf() +void itoa_to_buf(int n, char *buf, unsigned buflen) +{ + if (buflen && n<0) { + n = -n; + *buf++ = '-'; + buflen--; + } + utoa_to_buf((unsigned)n, buf, buflen); +} + +// This static buffer is used by both utoa() and itoa(), calling either one a +// second time will overwrite the previous results. +// +// The longest 32 bit integer is -2 billion plus a null terminator: 12 bytes. +// Note that int is always 32 bits on any remotely unix-like system, see +// http://www.unix.org/whitepapers/64bit.html for details. + +static char itoa_buf[12]; + +// Convert unsigned integer to ascii, returning a static buffer. +char *utoa(unsigned n) +{ + utoa_to_buf(n, itoa_buf, sizeof(itoa_buf)); + + return itoa_buf; +} + +char *itoa(int n) +{ + itoa_to_buf(n, itoa_buf, sizeof(itoa_buf)); + + return itoa_buf; +} diff --git a/lib/getmountlist.c b/lib/getmountlist.c index d2484937..8410a923 100644 --- a/lib/getmountlist.c +++ b/lib/getmountlist.c @@ -1,4 +1,8 @@ /* vi: set sw=4 ts=4 : */ +/* getmountlist.c - Get a linked list of mount points, with stat information. + * + * Copyright 2006 Rob Landley <rob@landley.net> + */ #include "toys.h" @@ -6,8 +10,9 @@ char *path_mounts = "/proc/mounts"; -// Get a list of mount points from /etc/mtab or /proc/mounts. This returns -// a reversed list, which is good for finding overmounts and such. +// Get a list of mount points from /etc/mtab or /proc/mounts, including +// statvfs() information. This returns a reversed list, which is good for +// finding overmounts and such. struct mtab_list *getmountlist(int die) { @@ -21,9 +26,13 @@ struct mtab_list *getmountlist(int die) if (die) error_exit("cannot open %s", path_mounts); } else { while (getmntent_r(fp, &me, evilbuf, sizeof(evilbuf))) { - mt = xmalloc(sizeof(struct mtab_list) + strlen(me.mnt_fsname) + + mt = xzalloc(sizeof(struct mtab_list) + strlen(me.mnt_fsname) + strlen(me.mnt_dir) + strlen(me.mnt_type) + 3); mt->next = mtlist; + // Get information about this filesystem. Yes, we need both. + stat(me.mnt_dir, &(mt->stat)); + statvfs(me.mnt_dir, &(mt->statvfs)); + // Remember information from /proc/mounts strcpy(mt->type, me.mnt_type); mt->dir = mt->type + strlen(mt->type) + 1; strcpy(mt->dir, me.mnt_dir); @@ -1,25 +1,44 @@ /* vi: set ts=4 :*/ +/* lib.h - header file for lib directory + * + * Copyright 2006 Rob Landley <rob@landley.net> + */ // functions.c +void verror_msg(char *msg, int err, va_list va); +void error_msg(char *msg, ...); +void perror_msg(char *msg, ...); void error_exit(char *msg, ...); +void perror_exit(char *msg, ...); void strlcpy(char *dest, char *src, size_t size); void *xmalloc(size_t size); void *xzalloc(size_t size); void xrealloc(void **ptr, size_t size); void *xstrndup(char *s, size_t n); char *xmsprintf(char *format, ...); -void *xexec(char **argv); +void xexec(char **argv); int xopen(char *path, int flags, int mode); FILE *xfopen(char *path, char *mode); char *xgetcwd(void); char *find_in_path(char *path, char *filename); +void utoa_to_buf(unsigned n, char *buf, unsigned buflen); +void itoa_to_buf(int n, char *buf, unsigned buflen); +char *utoa(unsigned n); +char *itoa(int n); // llist.c void llist_free(void *list, void (*freeit)(void *data)); +struct string_list { + struct string_list *next; + char *str; +}; + // getmountlist.c struct mtab_list { struct mtab_list *next; + struct stat stat; + struct statvfs statvfs; char *dir; char *device; char type[0]; |