Fixed a memory leak in lash. It seems that close_all was calling close()

[oweals/busybox.git] / utility.c

diff --git a/utility.c b/utility.c
index e3535966f367cbcdec3c3fa525506ccf5b0b2d38..2d27596e0975d6fd37a3735500bb74dd117088df 100644 (file)
--- a/utility.c
+++ b/utility.c
@@ -63,8 +63,8 @@
 #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";
@@ -189,18 +189,33 @@ _syscall1(int, sysinfo, struct sysinfo *, info);
 
 #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;
@@ -877,29 +892,32 @@ extern int parse_mode(const char *s, mode_t * theMode)
 #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)
@@ -927,18 +945,18 @@ void my_getgrgid(char *group, long gid)
 
 #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;
 }
@@ -1489,7 +1507,7 @@ extern char *find_unused_loop_device(void)
                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);