extern void usage(const char *usage)
{
- fprintf(stderr, "%s\n\n", full_version);
- fprintf(stderr, "Usage: %s\n", usage);
+ fprintf(stderr, "%s\n\nUsage: %s\n", full_version, usage);
exit(EXIT_FAILURE);
}
fflush(stdout);
fprintf(stderr, "%s: ", applet_name);
vfprintf(stderr, s, p);
- fflush(stderr);
}
extern void error_msg(const char *s, ...)
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);
+ int err=errno;
+ if(s == 0) s = "";
+ verror_msg(s, p);
+ if (*s) s = ": ";
+ fprintf(stderr, "%s%s\n", s, strerror(err));
}
extern void perror_msg(const char *s, ...)
exit(EXIT_FAILURE);
}
-#if defined BB_INIT || defined BB_MKSWAP || defined BB_MOUNT
+#if defined BB_INIT || defined BB_MKSWAP || defined BB_MOUNT || defined BB_NFSMOUNT
/* 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) { <stuff> }
int major = 0, minor = 0, patch = 0;
if (uname(&name) == -1) {
- perror("cannot get system information");
+ perror_msg("cannot get system information");
return (0);
}
major = atoi(strtok(name.release, "."));
#if defined BB_MOUNT || defined BB_UMOUNT
#ifndef __NR_umount2
-#define __NR_umount2 52
+static const int __NR_umount2 = 52;
#endif
/* Include our own version of <sys/mount.h>, since libc5 doesn't
#if defined BB_INSMOD || defined BB_LSMOD
#ifndef __NR_query_module
-#define __NR_query_module 167
+static const int __NR_query_module = 167;
#endif
_syscall5(int, query_module, const char *, name, int, which,
void *, buf, size_t, bufsize, size_t*, ret);
#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_DPKG_DEB)
/*
* Return TRUE if a fileName is a directory.
* Nonexistant files return FALSE.
}
#endif
-#if defined (BB_AR) || defined BB_CP_MV
+#if defined BB_AR || defined BB_CP_MV
/*
* Copy chunksize bytes between two file descriptors
*/
status = lstat(srcName, &srcStatBuf);
if (status < 0) {
- perror(srcName);
+ perror_msg("%s", srcName);
return FALSE;
}
/* Make sure the directory is writable */
status = mkdir(destName, 0777777 ^ umask(0));
if (status < 0 && errno != EEXIST) {
- perror(destName);
+ perror_msg("%s", destName);
return FALSE;
}
} else if (S_ISLNK(srcStatBuf.st_mode)) {
/* Warning: This could possibly truncate silently, to BUFSIZ chars */
link_size = readlink(srcName, &link_val[0], BUFSIZ);
if (link_size < 0) {
- perror(srcName);
+ perror_msg("%s", srcName);
return FALSE;
}
link_val[link_size] = '\0';
status = symlink(link_val, destName);
if (status < 0) {
- perror(destName);
+ perror_msg("%s", destName);
return FALSE;
}
#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)
} else if (S_ISFIFO(srcStatBuf.st_mode)) {
//fprintf(stderr, "copying fifo %s to %s\n", srcName, destName);
if (mkfifo(destName, 0644) < 0) {
- perror(destName);
+ perror_msg("%s", destName);
return FALSE;
}
} else if (S_ISBLK(srcStatBuf.st_mode) || S_ISCHR(srcStatBuf.st_mode)
|| S_ISSOCK(srcStatBuf.st_mode)) {
//fprintf(stderr, "copying soc, blk, or chr %s to %s\n", srcName, destName);
if (mknod(destName, srcStatBuf.st_mode, srcStatBuf.st_rdev) < 0) {
- perror(destName);
+ perror_msg("%s", destName);
return FALSE;
}
} else if (S_ISREG(srcStatBuf.st_mode)) {
//fprintf(stderr, "copying regular file %s to %s\n", srcName, destName);
rfd = open(srcName, O_RDONLY);
if (rfd < 0) {
- perror(srcName);
+ perror_msg("%s", srcName);
return FALSE;
}
wfd = open(destName, O_WRONLY | O_CREAT | O_TRUNC,
srcStatBuf.st_mode);
if (wfd < 0) {
- perror(destName);
+ perror_msg("%s", destName);
close(rfd);
return FALSE;
}
if (setModes == TRUE) {
/* This is fine, since symlinks never get here */
- if (chown(destName, srcStatBuf.st_uid, srcStatBuf.st_gid) < 0) {
- perror(destName);
- exit(EXIT_FAILURE);
- }
- if (chmod(destName, srcStatBuf.st_mode) < 0) {
- perror(destName);
- exit(EXIT_FAILURE);
- }
+ if (chown(destName, srcStatBuf.st_uid, srcStatBuf.st_gid) < 0)
+ perror_msg_and_die("%s", destName);
+ if (chmod(destName, srcStatBuf.st_mode) < 0)
+ perror_msg_and_die("%s", destName);
times.actime = srcStatBuf.st_atime;
times.modtime = srcStatBuf.st_mtime;
- if (utime(destName, ×) < 0) {
- perror(destName);
- exit(EXIT_FAILURE);
- }
+ if (utime(destName, ×) < 0)
+ perror_msg_and_die("%s", destName);
}
return TRUE;
error_exit:
- perror(destName);
+ perror_msg("%s", destName);
close(rfd);
close(wfd);
}
#endif /* BB_TAR || BB_AR */
-#if defined BB_AR || defined BB_CP_MV || defined BB_DD || defined BB_NC || defined BB_TAR
+#if defined BB_DD || defined BB_NC || defined BB_TAIL || defined BB_TAR || defined BB_AR || defined BB_CP_MV
/*
* Write all of the supplied buffer out to a file.
* This does multiple writes as necessary.
return total;
}
-#endif /* BB_TAR || BB_CP_MV || BB_AR */
-
+#endif
-#if defined BB_TAR || defined BB_TAIL || defined BB_AR || defined BB_SH || defined BB_CP_MV || defined BB_DD
+#if defined BB_AR || defined BB_CP_MV || defined BB_SH || defined BB_TAR
/*
* Read all of the supplied buffer from a file.
* This does multiple reads as necessary.
if (S_ISDIR(statbuf.st_mode)) {
DIR *dir;
- dir = opendir(fileName);
- if (!dir) {
- perror_msg("%s", fileName);
- return FALSE;
- }
if (dirAction != NULL && depthFirst == FALSE) {
status = dirAction(fileName, &statbuf, userData);
if (status == FALSE) {
perror_msg("%s", fileName);
return FALSE;
- }
+ } else if (status == SKIP)
+ return TRUE;
+ }
+ dir = opendir(fileName);
+ if (!dir) {
+ perror_msg("%s", fileName);
+ return FALSE;
}
while ((next = readdir(dir)) != NULL) {
char nextFile[BUFSIZ + 1];
*cpOld = '\0';
retVal = mkdir(buf, cp ? 0777 : mode);
if (retVal != 0 && errno != EEXIST) {
- perror(buf);
+ perror_msg("%s", buf);
return FALSE;
}
*cpOld = '/';
my_getid("/etc/group", group, gid, NULL);
}
+#if defined BB_ID
/* gets a gid given a user name */
long my_getpwnamegid(char *name)
{
my_getid("/etc/passwd", name, -1, &gid);
return gid;
}
+#endif
#endif
/* BB_CHMOD_CHOWN_CHGRP || BB_PS || BB_LS || BB_TAR \
#if (defined BB_CHVT) || (defined BB_DEALLOCVT) || (defined BB_SETKEYCODES)
/* From <linux/kd.h> */
-#define KDGKBTYPE 0x4B33 /* get keyboard type */
-#define KB_84 0x01
-#define KB_101 0x02 /* this is what we always answer */
+static const int KDGKBTYPE = 0x4B33; /* get keyboard type */
+static const int KB_84 = 0x01;
+static const int KB_101 = 0x02; /* this is what we always answer */
int is_a_console(int fd)
{
}
#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 atoi_w_units(const char *cp)
-{
- long value;
-
- if (!is_decimal(*cp))
- return -1;
-
- value = 0;
-
- while (is_decimal(*cp))
- value = value * 10 + *cp++ - '0';
-
- switch (*cp++) {
- case 'M':
- case 'm': /* `tail' uses it traditionally */
- value *= 1048576;
- break;
-
- case 'k':
- value *= 1024;
- break;
-
- case 'b':
- value *= 512;
- break;
-
- case 'w':
- value *= 2;
- break;
-
- case '\0':
- return value;
-
- default:
- return -1;
- }
-
- if (*cp)
- return -1;
-
- 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)
/* open device */
fd = open(device, O_RDONLY);
if (fd < 0)
- error_msg_and_die( "open failed for `%s': %s\n", device, strerror (errno));
+ perror_msg_and_die("open failed for `%s'", device);
/* Find out how many processes there are */
if (ioctl (fd, DEVPS_GET_NUM_PIDS, &num_pids)<0)
- error_msg_and_die( "\nDEVPS_GET_PID_LIST: %s\n", strerror (errno));
+ perror_msg_and_die("\nDEVPS_GET_PID_LIST");
/* Allocate some memory -- grab a few extras just in case
* some new processes start up while we wait. The kernel will
/* Now grab the pid list */
if (ioctl (fd, DEVPS_GET_PID_LIST, pid_array)<0)
- error_msg_and_die( "\nDEVPS_GET_PID_LIST: %s\n", strerror (errno));
+ perror_msg_and_die("\nDEVPS_GET_PID_LIST");
/* Now search for a match */
for (i=1, j=0; i<pid_array[0] ; i++) {
info.pid = pid_array[i];
if (ioctl (fd, DEVPS_GET_PID_INFO, &info)<0)
- error_msg_and_die( "\nDEVPS_GET_PID_INFO: %s\n", strerror (errno));
+ perror_msg_and_die("\nDEVPS_GET_PID_INFO");
/* Make sure we only match on the process name */
p=info.command_line+1;
/* close device */
if (close (fd) != 0)
- error_msg_and_die( "close failed for `%s': %s\n",device, strerror (errno));
+ perror_msg_and_die("close failed for `%s'", device);
return pidList;
}
dir = opendir("/proc");
if (!dir)
- error_msg_and_die( "Cannot open /proc: %s\n", strerror (errno));
+ perror_msg_and_die("Cannot open /proc");
while ((next = readdir(dir)) != NULL) {
FILE *status;
}
#endif
-#if defined BB_FEATURE_NFSMOUNT || defined BB_LS || defined BB_SH || defined BB_WGET
+#if defined BB_NFSMOUNT || defined BB_LS || defined BB_SH || defined BB_WGET || \
+ defined BB_DPKG_DEB || defined BB_TAR
# ifndef DMALLOC
extern char * xstrdup (const char *s) {
char *t;
# endif
#endif
-#if defined BB_FEATURE_NFSMOUNT
+#if defined BB_NFSMOUNT
extern char * xstrndup (const char *s, int n) {
char *t;
int fd;
if ((fd = open(device, O_RDONLY)) < 0) {
- perror(device);
+ perror_msg("%s", device);
return (FALSE);
}
if (ioctl(fd, LOOP_CLR_FD, 0) < 0) {
- perror("ioctl: LOOP_CLR_FD");
+ perror_msg("ioctl: LOOP_CLR_FD");
return (FALSE);
}
close(fd);
mode = *loopro ? O_RDONLY : O_RDWR;
if ((ffd = open(file, mode)) < 0 && !*loopro
&& (errno != EROFS || (ffd = open(file, mode = O_RDONLY)) < 0)) {
- perror(file);
+ perror_msg("%s", file);
return 1;
}
if ((fd = open(device, mode)) < 0) {
close(ffd);
- perror(device);
+ perror_msg("%s", device);
return 1;
}
*loopro = (mode == O_RDONLY);
loopinfo.lo_encrypt_key_size = 0;
if (ioctl(fd, LOOP_SET_FD, ffd) < 0) {
- perror("ioctl: LOOP_SET_FD");
+ perror_msg("ioctl: LOOP_SET_FD");
close(fd);
close(ffd);
return 1;
}
if (ioctl(fd, LOOP_SET_STATUS, &loopinfo) < 0) {
(void) ioctl(fd, LOOP_CLR_FD, 0);
- perror("ioctl: LOOP_SET_STATUS");
+ perror_msg("ioctl: LOOP_SET_STATUS");
close(fd);
close(ffd);
return 1;
}
#endif
-#if defined BB_BASENAME || defined BB_LN || defined BB_SH || defined BB_INIT || defined BB_FEATURE_USE_PROCFS
+#if defined BB_BASENAME || defined BB_LN || defined BB_SH || defined BB_INIT || \
+ defined BB_FEATURE_USE_PROCFS || defined BB_WGET
char *get_last_path_component(char *path)
{
char *s=path+strlen(path)-1;
{
FILE *fp;
if ((fp = fopen(path, mode)) == NULL) {
- error_msg("%s: %s\n", path, strerror(errno));
+ perror_msg("%s", path);
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
+ || defined BB_SED || defined BB_SH || defined BB_TAR || defined BB_UNIQ \
+ || defined BB_WC || defined BB_CMP || defined BB_SORT
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));
+ perror_msg_and_die("%s", path);
return fp;
}
#endif
return strcmp(applet1->name, applet2->name);
}
-#if defined BB_NC
+#if defined BB_DD || defined BB_TAIL
+unsigned long parse_number(const char *numstr, struct suffix_mult *suffixes)
+{
+ struct suffix_mult *sm;
+ unsigned long int ret;
+ int len;
+ char *end;
+
+ ret = strtoul(numstr, &end, 10);
+ if (numstr == end)
+ error_msg_and_die("invalid number `%s'\n", numstr);
+ while (end[0] != '\0') {
+ for (sm = suffixes; sm->suffix != NULL; sm++) {
+ len = strlen(sm->suffix);
+ if (strncmp(sm->suffix, end, len) == 0) {
+ ret *= sm->mult;
+ end += len;
+ break;
+ }
+ }
+ if (sm->suffix == NULL)
+ error_msg_and_die("invalid number `%s'\n", numstr);
+ }
+ return ret;
+}
+#endif
+
+#if defined BB_DD || defined BB_NC || defined BB_TAIL
ssize_t safe_read(int fd, void *buf, size_t count)
{
ssize_t n;
}
#endif
+#ifdef BB_FEATURE_HUMAN_READABLE
+char *format(unsigned long val, unsigned long hr)
+{
+ static char str[10] = "\0";
+
+ if(val == 0)
+ return("0");
+ if(hr)
+ snprintf(str, 9, "%ld", val/hr);
+ else if(val >= GIGABYTE)
+ snprintf(str, 9, "%.1LfG", ((long double)(val)/GIGABYTE));
+ else if(val >= MEGABYTE)
+ snprintf(str, 9, "%.1LfM", ((long double)(val)/MEGABYTE));
+ else if(val >= KILOBYTE)
+ snprintf(str, 9, "%.1Lfk", ((long double)(val)/KILOBYTE));
+ else
+ snprintf(str, 9, "%ld", (val));
+ return(str);
+}
+#endif
+
/* END CODE */
/*
Local Variables:
projects / oweals / busybox.git / blobdiff