#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";
#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_FEATURE_NEW_MODULE_INTERFACE && ( defined BB_INSMOD || defined BB_LSMOD )
#ifndef __NR_query_module
static const int __NR_query_module = 167;
perror_msg("%s", fileName);
return FALSE;
}
+ status = TRUE;
while ((next = readdir(dir)) != NULL) {
- char nextFile[BUFSIZ + 1];
+ char nextFile[PATH_MAX];
if ((strcmp(next->d_name, "..") == 0)
- || (strcmp(next->d_name, ".") == 0)) {
+ || (strcmp(next->d_name, ".") == 0)) {
continue;
}
- if (strlen(fileName) + strlen(next->d_name) + 1 > BUFSIZ) {
+ if (strlen(fileName) + strlen(next->d_name) + 1 > PATH_MAX) {
error_msg(name_too_long);
return FALSE;
}
memset(nextFile, 0, sizeof(nextFile));
- sprintf(nextFile, "%s/%s", fileName, next->d_name);
- status =
- recursive_action(nextFile, TRUE, followLinks, depthFirst,
- fileAction, dirAction, userData);
- if (status == FALSE) {
- closedir(dir);
- return FALSE;
+ if (fileName[strlen(fileName)-1] == '/')
+ sprintf(nextFile, "%s%s", fileName, next->d_name);
+ else
+ sprintf(nextFile, "%s/%s", fileName, next->d_name);
+ if (recursive_action(nextFile, TRUE, followLinks, depthFirst,
+ fileAction, dirAction, userData) == FALSE) {
+ status = FALSE;
}
}
- status = closedir(dir);
- if (status < 0) {
- perror_msg("%s", fileName);
- return FALSE;
- }
+ closedir(dir);
if (dirAction != NULL && depthFirst == TRUE) {
- status = dirAction(fileName, &statbuf, userData);
- if (status == FALSE) {
+ if (dirAction(fileName, &statbuf, userData) == FALSE) {
perror_msg("%s", fileName);
return FALSE;
}
}
+ if (status == FALSE)
+ return FALSE;
} else {
if (fileAction == NULL)
return TRUE;
#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;
}
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);
#endif
#ifdef BB_FEATURE_HUMAN_READABLE
-const char *format(unsigned long val, unsigned long hr)
+const char *make_human_readable_str(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
-#if defined(BB_GREP) || defined(BB_HOSTNAME) || defined(BB_SED) || defined(BB_TAR) || defined(BB_WGET) || defined(BB_XARGS)
+#if defined(BB_GREP) || defined(BB_HOSTNAME) || defined(BB_SED) || defined(BB_TAR) || defined(BB_WGET) || defined(BB_XARGS) || defined(BB_SH)
void chomp(char *s)
{
size_t len = strlen(s);
}
#endif
+#if defined(BB_SH)
+void trim(char *s)
+{
+ /* trim trailing whitespace */
+ while (isspace(s[strlen(s)-1]))
+ s[strlen(s)-1]='\0';
+
+ /* trim leading whitespace */
+ memmove(s, &s[strspn(s, " \n\r\t\v")], strlen(s));
+
+}
+#endif
+
/* END CODE */
/*
Local Variables:
projects / oweals / busybox.git / blobdiff