*
*/
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <dirent.h>
+#include <time.h>
+#include <utime.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <sys/ioctl.h>
+#include <sys/utsname.h> /* for uname(2) */
+
#include "busybox.h"
#if defined (BB_CHMOD_CHOWN_CHGRP) \
|| defined (BB_CP_MV) \
#define bb_need_full_version
#define BB_DECLARE_EXTERN
#include "messages.c"
-#include "usage.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <time.h>
-#include <utime.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <sys/ioctl.h>
-#include <sys/utsname.h> /* for uname(2) */
#include "pwd_grp/pwd.h"
#include "pwd_grp/grp.h"
#include <sys/syscall.h>
#include <linux/unistd.h>
-/* Busybox mount uses either /proc/filesystems or /dev/mtab to get the
- * list of available filesystems used for the -t auto option */
+/* Busybox mount uses either /proc/mounts or /dev/mtab to
+ * get the list of currently mounted filesystems */
#if defined BB_MOUNT || defined BB_UMOUNT || defined BB_DF
# if defined BB_MTAB
const char mtab_file[] = "/etc/mtab";
extern void show_usage(void)
{
- static const char no_help[] = "No help available.\n";
-
- const char *usage_string = no_help;
+ const char *format_string;
+ const char *usage_string = usage_messages;
+ int i;
- if (applet_using->usage_index >= 0) {
- usage_string = usage_messages[applet_using->usage_index];
+ for (i = applet_using - applets; i > 0; ) {
+ if (!*usage_string++) {
+ --i;
+ }
}
- fprintf(stderr, "%s\n\nUsage: %s %s\n", full_version,
- applet_using->name, usage_string);
+ format_string = "%s\n\nUsage: %s %s\n\n";
+ if(*usage_string == 0)
+ format_string = "%s\n\nNo help available.\n\n";
+ fprintf(stderr, format_string,
+ full_version, applet_using->name, usage_string);
exit(EXIT_FAILURE);
}
#if defined BB_MOUNT || defined BB_UMOUNT
-#ifndef __NR_umount2
-static const int __NR_umount2 = 52;
-#endif
-
/* Include our own version of <sys/mount.h>, 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);
+#ifndef __NR_umount2
+# warning This kernel does not support the umount2 syscall
+# warning The umount2 system call is being stubbed out...
+ int umount2(const char * special_file, int flags)
+ {
+ /* BusyBox was compiled against a kernel that did not support
+ * the umount2 system call. To make this application work,
+ * you will need to recompile with a kernel supporting the
+ * umount2 system call.
+ */
+ fprintf(stderr, "\n\nTo make this application work, you will need to recompile\n");
+ fprintf(stderr, "with a kernel supporting the umount2 system call. -Erik\n\n");
+ errno=ENOSYS;
+ return -1;
+ }
+# else
+ extern _syscall2(int, umount2, const char *, special_file, int, flags);
+# endif
#endif
-#if defined BB_INSMOD || defined BB_LSMOD
+
+
+#if defined BB_FEATURE_NEW_MODULE_INTERFACE && ( defined BB_INSMOD || defined BB_LSMOD )
#ifndef __NR_query_module
static const int __NR_query_module = 167;
#endif
#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 || defined BB_SH
+
+#if defined BB_CHMOD_CHOWN_CHGRP || defined BB_ID
/* returns a uid given a username */
-long my_getpwnam(char *name)
+long my_getpwnam(const char *name)
{
struct passwd *myuser;
myuser = getpwnam(name);
if (myuser==NULL)
- return(-1);
+ error_msg_and_die("unknown user name: %s", name);
return myuser->pw_uid;
}
/* returns a gid given a group name */
-long my_getgrnam(char *name)
+long my_getgrnam(const char *name)
{
struct group *mygroup;
mygroup = getgrnam(name);
if (mygroup==NULL)
- return(-1);
+ error_msg_and_die("unknown group name: %s", name);
return (mygroup->gr_gid);
}
+#endif
/* gets a username given a uid */
void my_getpwuid(char *name, long uid)
#if defined BB_ID
/* gets a gid given a user name */
-long my_getpwnamegid(char *name)
+long my_getpwnamegid(const char *name)
{
struct group *mygroup;
struct passwd *myuser;
myuser=getpwnam(name);
if (myuser==NULL)
- error_msg_and_die( "unknown user name: %s", name);
+ error_msg_and_die("unknown user name: %s", name);
mygroup = getgrgid(myuser->pw_gid);
if (mygroup==NULL)
- error_msg_and_die( "unknown gid %ld", (long)myuser->pw_gid);
+ error_msg_and_die("unknown gid %ld", (long)myuser->pw_gid);
return mygroup->gr_gid;
}
}
#endif
-#if defined BB_NFSMOUNT || defined BB_LS || defined BB_SH || defined BB_WGET || \
- defined BB_DPKG_DEB || defined BB_TAR
+#if defined BB_NFSMOUNT || defined BB_LS || defined BB_SH || \
+ defined BB_WGET || defined BB_DPKG_DEB || defined BB_TAR || \
+ defined BB_LN
# ifndef DMALLOC
extern char * xstrdup (const char *s) {
char *t;
if (s == NULL)
error_msg_and_die("xstrndup bug");
- t = xmalloc(n+1);
- strncpy(t,s,n);
- t[n] = 0;
-
- return t;
+ t = xmalloc(++n);
+
+ return safe_strncpy(t,s,n);
}
#endif
-#if defined BB_IFCONFIG || defined BB_ROUTE
+#if defined BB_IFCONFIG || defined BB_ROUTE || defined BB_NFSMOUNT || \
+ defined BB_FEATURE_MOUNT_LOOP
/* Like strncpy but make sure the resulting string is always 0 terminated. */
extern char * safe_strncpy(char *dst, const char *src, size_t size)
{
*loopro = (mode == O_RDONLY);
memset(&loopinfo, 0, sizeof(loopinfo));
- strncpy(loopinfo.lo_name, file, LO_NAME_SIZE);
- loopinfo.lo_name[LO_NAME_SIZE - 1] = 0;
+ safe_strncpy(loopinfo.lo_name, file, LO_NAME_SIZE);
loopinfo.lo_offset = offset;
sprintf(dev, "/dev/loop%d", i);
if (stat(dev, &statbuf) == 0 && S_ISBLK(statbuf.st_mode)) {
if ((fd = open(dev, O_RDONLY)) >= 0) {
- if (ioctl(fd, LOOP_GET_STATUS, &loopinfo) == -1) {
+ if (ioctl(fd, LOOP_GET_STATUS, &loopinfo) != 0) {
if (errno == ENXIO) { /* probably free */
close(fd);
return strdup(dev);
#if defined BB_HOSTNAME || defined BB_LOADACM || defined BB_MORE \
|| defined BB_SED || defined BB_SH || defined BB_TAR || defined BB_UNIQ \
|| defined BB_WC || defined BB_CMP || defined BB_SORT || defined BB_WGET \
- || defined BB_MOUNT
+ || defined BB_MOUNT || defined BB_ROUTE
FILE *xfopen(const char *path, const char *mode)
{
FILE *fp;
}
}
-#if defined BB_DD || defined BB_TAIL
+#if defined BB_DD || defined BB_TAIL || defined BB_STTY
unsigned long parse_number(const char *numstr,
const struct suffix_mult *suffixes)
{
if (numstr == end)
error_msg_and_die("invalid number `%s'", 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;
- }
+ sm = suffixes;
+ while ( sm != 0 ) {
+ if(sm->suffix) {
+ len = strlen(sm->suffix);
+ if (strncmp(sm->suffix, end, len) == 0) {
+ ret *= sm->mult;
+ end += len;
+ break;
+ }
+ sm++;
+
+ } else
+ sm = 0;
}
- if (sm->suffix == NULL)
+ if (sm == 0)
error_msg_and_die("invalid number `%s'", numstr);
}
return ret;
#ifdef BB_FEATURE_HUMAN_READABLE
const char *format(unsigned long val, unsigned long hr)
{
- static const char strings[] = { '0', 0, 'k', 0, 'M', 0, 'G', 0 };
- static const char fmt[] = "%lu";
- static const char fmt_u[] = "%lu.%lu%s";
-
- static char str[10];
-
- unsigned long frac __attribute__ ((unused)); /* 'may be uninitialized' warning is ok */
- const char *u;
- const char *f;
-
-#if 1
- if(val == 0) { /* This may be omitted to reduce size */
- return strings; /* at the cost of speed. */
- }
-#endif
-
- u = strings;
- f = fmt;
- if (hr) {
- val /= hr;
- } else {
- while ((val >= KILOBYTE) && (*u != 'G')) {
- f = fmt_u;
- u += 2;
- frac = (((val % KILOBYTE) * 10) + (KILOBYTE/2)) / KILOBYTE;
- val /= KILOBYTE;
- if (frac >= 10) { /* We need to round up here. */
- ++val;
- frac = 0;
- }
- }
+ int i=0;
+ static char str[10] = "\0";
+ static const char strings[] = { 'k', 'M', 'G', 'T', 0 };
+ unsigned long divisor = 1;
+
+ if(val == 0)
+ return("0");
+ if(hr)
+ snprintf(str, 9, "%ld", val/hr);
+ else {
+ while(val >= divisor && i <= 4) {
+ divisor=divisor<<10, i++;
+ }
+ divisor=divisor>>10, i--;
+ snprintf(str, 9, "%.1Lf%c", (long double)(val)/divisor, strings[i]);
}
-
- /* If f==fmt then 'frac' and 'u' are ignored and need not be set. */
- snprintf(str, sizeof(str), f, val, frac, u);
-
- return str;
+ return(str);
}
#endif
projects / oweals / busybox.git / blobdiff