Various fixes (#6)

Author: Gregory Nutt <[email protected]>

    Run all .c and .h affected by this PR through nxstyle.

Author: Alin Jerpelea <[email protected]>

    * system/usbmsc: Fix accessing uninitialized pointer
    * fsutils/inifile: Fix a memory leak in inifile error case
    * fsutils/mksmartfs: Fix uninitialized return code
    * system/zmodem: Fix a compile error in zmodem debug enabled
    * nshlib/nsh_fscmds.c: Add syntax check to cp command

    If the destication of NutShell cp command is the same with the source,
    it may cause the file corruption. Add the syntax check of argument to
    avoid this problem.

Author: jerpelea

fsutils/inifile/inifile.c

@@ -106,7 +106,7 @@ struct inifile_state_s
 {
   FILE *instream;
   int   nextch;
-  char  line[CONFIG_FSUTILS_INIFILE_MAXLINE+1];
+  char  line[CONFIG_FSUTILS_INIFILE_MAXLINE + 1];
 };
 
 /****************************************************************************
@@ -185,7 +185,7 @@ static int inifile_read_line(FAR struct inifile_state_s *priv)
   while ((nbytes < CONFIG_FSUTILS_INIFILE_MAXLINE) &&
          (priv->nextch != EOF) &&
          (priv->nextch != '\n'))
-   {
+    {
       /* Always ignore carriage returns */
 
       if (priv->nextch != '\r')
@@ -242,7 +242,8 @@ static int inifile_read_noncomment_line(FAR struct inifile_state_s *priv)
 
   /* Read until either a (1) no further lines are found in
    * the file, or (2) a line that does not begin with a semi-colon
-   * is found */
+   * is found.
+   */
 
   do nbytes = inifile_read_line(priv);
   while (nbytes > 0 && priv->line[0] == ';');
@@ -354,7 +355,7 @@ static bool inifile_read_variable(FAR struct inifile_state_s *priv,
    * the section is found, or (3) a valid variable assignment is found.
    */
 
-  for (;;)
+  for (; ; )
     {
       /* Read the next line in the buffer */
 
@@ -365,9 +366,9 @@ static bool inifile_read_variable(FAR struct inifile_state_s *priv,
        */
 
       if (!nbytes || priv->line[0] == '[')
-       {
-         return false;
-       }
+        {
+          return false;
+        }
 
       /* Search for the '=' delimiter.  NOTE  the line is guaranteed to
        * be NULL terminated by inifile_read_noncomment_line().
@@ -389,7 +390,7 @@ static bool inifile_read_variable(FAR struct inifile_state_s *priv,
            * a NULL string
            */
 
-          varinfo->variable = (char*)priv->line;
+          varinfo->variable = (FAR char *)priv->line;
           varinfo->value    = (ptr + 1);
           return true;
         }
@@ -418,7 +419,7 @@ static FAR char *
 
   iniinfo("variable=\"%s\"\n", variable);
 
-  for (;;)
+  for (; ; )
     {
       /* Get the next variable from this section. */
 
@@ -527,6 +528,7 @@ INIHANDLE inifile_initialize(FAR const char *inifile_name)
   else
     {
       inidbg("ERROR: Could not open \"%s\"\n", inifile_name);
+      free(priv);
       return (INIHANDLE)NULL;
     }
 }

fsutils/mksmartfs/mksmartfs.c

@@ -95,7 +95,8 @@
 int issmartfs(FAR const char *pathname)
 {
   struct smart_format_s fmt;
-  int ret, fd;
+  int fd;
+  int ret;
 
   /* Find the inode of the block driver identified by 'source' */
 
@@ -121,6 +122,7 @@ int issmartfs(FAR const char *pathname)
     }
 
 out:
+
   /* Close the driver */
 
   close(fd);
@@ -157,22 +159,25 @@ int issmartfs(FAR const char *pathname)
  ****************************************************************************/
 
 #ifdef CONFIG_SMARTFS_MULTI_ROOT_DIRS
-int mksmartfs(FAR const char *pathname, uint16_t sectorsize, uint8_t nrootdirs)
+int mksmartfs(FAR const char *pathname, uint16_t sectorsize,
+              uint8_t nrootdirs)
 #else
 int mksmartfs(FAR const char *pathname, uint16_t sectorsize)
 #endif
 {
   struct smart_format_s fmt;
-  int ret, fd;
-  int x;
-  uint8_t type;
   struct smart_read_write_s request;
+  uint8_t type;
+  int fd;
+  int x;
+  int ret;
 
   /* Find the inode of the block driver indentified by 'source' */
 
   fd = open(pathname, O_RDWR);
   if (fd < 0)
     {
+      ret = -ENOENT;
       goto errout;
     }
 
@@ -227,11 +232,13 @@ int mksmartfs(FAR const char *pathname, uint16_t sectorsize)
     }
 
 errout_with_driver:
+
   /* Close the driver */
 
   close(fd);
 
 errout:
+
   /* Release all allocated memory */
 
   /* Return any reported errors */

nshlib/nsh_fscmds.c

@@ -56,7 +56,6 @@
 #include <errno.h>
 #include <debug.h>
 
-
 #if !defined(CONFIG_DISABLE_MOUNTPOINT)
 #  ifdef CONFIG_FS_READABLE /* Need at least one filesytem in configuration */
 #    include <sys/mount.h>
@@ -240,47 +239,47 @@ static int ls_handler(FAR struct nsh_vtbl_s *vtbl, FAR const char *dirpath,
 
           if ((buf.st_mode & S_IRUSR) != 0)
             {
-              details[1]='r';
+              details[1] = 'r';
             }
 
           if ((buf.st_mode & S_IWUSR) != 0)
             {
-              details[2]='w';
+              details[2] = 'w';
             }
 
           if ((buf.st_mode & S_IXUSR) != 0)
             {
-              details[3]='x';
+              details[3] = 'x';
             }
 
           if ((buf.st_mode & S_IRGRP) != 0)
             {
-              details[4]='r';
+              details[4] = 'r';
             }
 
           if ((buf.st_mode & S_IWGRP) != 0)
             {
-              details[5]='w';
+              details[5] = 'w';
             }
 
           if ((buf.st_mode & S_IXGRP) != 0)
             {
-              details[6]='x';
+              details[6] = 'x';
             }
 
           if ((buf.st_mode & S_IROTH) != 0)
             {
-              details[7]='r';
+              details[7] = 'r';
             }
 
           if ((buf.st_mode & S_IWOTH) != 0)
             {
-              details[8]='w';
+              details[8] = 'w';
             }
 
           if ((buf.st_mode & S_IXOTH) != 0)
             {
-              details[9]='x';
+              details[9] = 'x';
             }
 
           nsh_output(vtbl, " %s", details);
@@ -561,7 +560,7 @@ int cmd_cp(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
 
           /* Construct the full path to the new file */
 
-          allocpath = nsh_getdirpath(vtbl, destpath, basename(argv[1]) );
+          allocpath = nsh_getdirpath(vtbl, destpath, basename(argv[1]));
           if (!allocpath)
             {
               nsh_error(vtbl, g_fmtcmdoutofmemory, argv[0]);
@@ -581,6 +580,14 @@ int cmd_cp(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
         }
     }
 
+  /* Check if the destination does not match the source */
+
+  if (strcmp(destpath, srcpath) == 0)
+    {
+      nsh_error(vtbl, g_fmtsyntax, argv[0]);
+      goto errout_with_allocpath;
+    }
+
   /* Now open the destination */
 
   wrfd = open(destpath, oflags, 0666);
@@ -592,7 +599,7 @@ int cmd_cp(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
 
   /* Now copy the file */
 
-  for (;;)
+  for (; ; )
     {
       int nbytesread;
       int nbyteswritten;
@@ -644,9 +651,10 @@ int cmd_cp(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
                 }
               else
                 {
-                 /* Read error */
+                  /* Read error */
 
-                  nsh_error(vtbl, g_fmtcmdfailed, argv[0], "write", NSH_ERRNO);
+                  nsh_error(vtbl, g_fmtcmdfailed, argv[0], "write",
+                            NSH_ERRNO);
                 }
 
               goto errout_with_wrfd;
@@ -678,6 +686,7 @@ int cmd_cp(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
     {
       nsh_freefullpath(srcpath);
     }
+
 errout:
   return ret;
 }
@@ -862,7 +871,8 @@ int cmd_losmart(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
   /* Get the losetup options:  Two forms are supported:
    *
    *   losmart -d <loop-device>
-   *   losmart [-m minor-number] [-o <offset>] [-e erasesize] [-s sectsize] [-r] <filename>
+   *   losmart [-m minor-number] [-o <offset>] [-e erasesize] [-s sectsize]
+   *           [-r] <filename>
    *
    * NOTE that the -o and -r options are accepted with the -d option, but
    * will be ignored.
@@ -955,7 +965,8 @@ int cmd_losmart(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
     {
       /* Tear down the loop device. */
 
-      ret = ioctl(fd, SMART_LOOPIOC_TEARDOWN, (unsigned long)((uintptr_t) loopdev));
+      ret = ioctl(fd, SMART_LOOPIOC_TEARDOWN,
+                 (unsigned long)((uintptr_t) loopdev));
       if (ret < 0)
         {
           nsh_error(vtbl, g_fmtcmdfailed, argv[0], "ioctl", NSH_ERRNO);
@@ -973,7 +984,8 @@ int cmd_losmart(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
       setup.offset    = offset;     /* An offset that may be applied to the device */
       setup.readonly  = readonly;   /* True: Read access will be supported only */
 
-      ret = ioctl(fd, SMART_LOOPIOC_SETUP, (unsigned long)((uintptr_t)&setup));
+      ret = ioctl(fd, SMART_LOOPIOC_SETUP,
+                  (unsigned long)((uintptr_t)&setup));
       if (ret < 0)
         {
           nsh_error(vtbl, g_fmtcmdfailed, argv[0], "ioctl", NSH_ERRNO);
@@ -1091,7 +1103,7 @@ int cmd_ls(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
       switch (option)
         {
           case 'l':
-            lsflags |= (LSFLAGS_SIZE|LSFLAGS_LONG);
+            lsflags |= (LSFLAGS_SIZE | LSFLAGS_LONG);
             break;
 
           case 'R':
@@ -1169,7 +1181,8 @@ int cmd_ls(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
        * file
        */
 
-      ret = ls_handler(vtbl, fullpath, NULL, (FAR void *)((uintptr_t)lsflags));
+      ret = ls_handler(vtbl, fullpath, NULL,
+                       (FAR void *)((uintptr_t)lsflags));
     }
   else
     {
@@ -1178,7 +1191,7 @@ int cmd_ls(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
       nsh_output(vtbl, "%s:\n", fullpath);
 
       ret = nsh_foreach_direntry(vtbl, "ls", fullpath, ls_handler,
-                                 (FAR void*)((uintptr_t)lsflags));
+                                 (FAR void *)((uintptr_t)lsflags));
       if (ret == OK && (lsflags & LSFLAGS_RECURSIVE) != 0)
         {
           /* Then recurse to list each directory within the directory */
@@ -1282,7 +1295,7 @@ int cmd_mkfatfs(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
 
   /* There should be exactly one parameter left on the command-line */
 
-  if (optind == argc-1)
+  if (optind == argc - 1)
     {
       fullpath = nsh_getfullpath(vtbl, argv[optind]);
       if (fullpath == NULL)
@@ -1480,7 +1493,8 @@ int cmd_mksmartfs(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
                 nsh_error(vtbl, "Sector size must be 256-16384\n");
                 return EINVAL;
               }
-            if (sectorsize & (sectorsize-1))
+
+            if (sectorsize & (sectorsize - 1))
               {
                 nsh_error(vtbl, "Sector size must be power of 2\n");
                 return EINVAL;
@@ -1523,7 +1537,8 @@ int cmd_mksmartfs(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
 #endif
           if (ret < 0)
             {
-              nsh_error(vtbl, g_fmtcmdfailed, argv[0], "mksmartfs", NSH_ERRNO);
+              nsh_error(vtbl, g_fmtcmdfailed, argv[0], "mksmartfs",
+                        NSH_ERRNO);
             }
         }
 
@@ -1594,6 +1609,7 @@ int cmd_readlink(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
   ssize_t len;
 
   /* readlink <link> */
+
   /* Get the fullpath to the directory */
 
   fullpath = nsh_getfullpath(vtbl, argv[1]);
@@ -1734,7 +1750,7 @@ int cmd_cmp(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
    * files.
    */
 
-  for (;;)
+  for (; ; )
     {
       char buf1[128];
       char buf2[128];