Changeset 34 for trunk/src/sh_files.c

Timestamp:

May 19, 2006, 8:09:51 PM (18 years ago)

Author:

rainer

Message:

Code cleanup and minor fixes

File:

• trunk/src/sh_files.c (modified) (16 diffs)

trunk/src/sh_files.c

@@ -200 +200 @@
 
   dirstack_t * ptr;
-  char       * base;
+  char       * dir;
   char       * file;
   
@@ -215 +215 @@
       if (ptr->checked == S_FALSE)
         {
-          base = sh_util_basename (ptr->name);
-          file = sh_util_filename (ptr->name);
+          dir  = sh_util_dirname (ptr->name);
+          file = sh_util_basename (ptr->name);
 #if defined(WITH_TPT)
           tmp = sh_util_safe_name (ptr->name);
@@ -231 +231 @@
 
           BREAKEXIT(sh_files_filecheck);
-          status = sh_files_filecheck (ptr->class, base, file, 
+          status = sh_files_filecheck (ptr->class, dir, file, 
                                        (int *) &(ptr->reported), 0);
           
@@ -348 +348 @@
             }
           SH_FREE(file);
-          SH_FREE(base);
+          SH_FREE(dir);
 
           ptr->checked = S_TRUE;
@@ -729 +729 @@
 #endif
 
-int sh_files_push_file_int (int class, const char * str_s, int len)
+int sh_files_push_file_int (int class, const char * str_s, size_t len)
 {
   dirstack_t * new_item_ptr;
@@ -777 +777 @@
 static int sh_files_pushfile (int class, const char * str_s)
 {
-  int     len;
+  size_t  len;
   char  * tmp;
   char  * p;
@@ -1132 +1132 @@
 }
 
-int sh_files_push_dir_int (int class, char * tail, int len, int rdepth)
+int sh_files_push_dir_int (int class, char * tail, size_t len, int rdepth)
 {
   zAVLTree   * tree;
@@ -1194 +1194 @@
 {
   char  * tmp;
-  int     len;
+  size_t  len;
   int     rdepth = 0;
   char  * tail = NULL;
@@ -1326 +1326 @@
   SH_FREE(p);
   SL_RETURN((0), _("sh_files_pushdir"));
-}  
+}
 
 struct sh_dirent {
@@ -1354 +1354 @@
 {
   struct sh_dirent * this;
-  int i;
+  size_t len;
 
   if (thisEntry == NULL)
     return dirlist;
   
-  i = sl_strlen(thisEntry->d_name);
-  if (i == 0)
+  len = sl_strlen(thisEntry->d_name);
+  if (len == 0)
     return dirlist;
-  ++i;
+  ++len;
   
   this = SH_ALLOC(sizeof(struct sh_dirent));
@@ -1368 +1368 @@
     return dirlist;
 
-  this->sh_d_name = SH_ALLOC(i);
-  sl_strlcpy(this->sh_d_name, thisEntry->d_name, i);
+  this->sh_d_name = SH_ALLOC(len);
+  sl_strlcpy(this->sh_d_name, thisEntry->d_name, len);
 
   this->next = dirlist;
@@ -1492 +1492 @@
 
   int             hardlink_num = 0;
-
+#if !defined(HOST_IS_DARWIN)
+  size_t          len;
+#endif
 
   SL_ENTER(_("sh_files_checkdir"));
@@ -1866 +1868 @@
       if (0 != sh_files_hle_test(hardlink_num-theDir.NumDirs, iname))
         {
-          tmpcat = SH_ALLOC(strlen(tmpname) + 256);
-          sl_snprintf(tmpcat, strlen(tmpname) + 256, 
+          len = strlen(tmpname);
+          if (sl_ok_adds(len, 256)) 
+            len += 256;
+          tmpcat = SH_ALLOC(len);
+          sl_snprintf(tmpcat, len, 
                       _("%s: subdirectory count (%d) != hardlinks (%d)"),
                       tmpname, theDir.NumDirs, hardlink_num);
@@ -1886 +1891 @@
 
 static ShFileType sh_files_filecheck (int class, char * dirName, 
-                                      char * fileName,
+                                      char * infileName,
                                       int * reported, 
                                       int rsrcflag)
@@ -1898 +1903 @@
   char          * tmpdir;
   char          * tmpname;
+  char          * fileName;
   struct utimbuf  utime_buf;
 
@@ -1905 +1911 @@
   if (0 == (rand() % 2))
     (void) sh_derr();
+
+  if (dirName && infileName && (dirName[0] == '/') && (dirName[1] == '\0')
+      && (infileName[0] == '/') && (infileName[1] == '\0'))
+    {
+      fileName = NULL;
+    }
+  else
+    {
+      fileName = infileName;
+    }
 
   /* fileName may be NULL if this is a directory