Changeset 76 for trunk/src/sh_hash.c

Timestamp:

Dec 19, 2006, 10:01:59 PM (18 years ago)

Author:

rainer

Message:

Fix for ticket #38 (csv escaping) and #39 (building on cygwin). Also optimize a bit.

File:

• trunk/src/sh_hash.c (modified) (5 diffs)

trunk/src/sh_hash.c

@@ -1460 +1460 @@
   if (sh.flag.update == S_FALSE)
     {
-      if (pushdata_stdout == S_FALSE)
-        {
-          pushdata_fd = -1;
-          if ( SL_ISERROR(pushdata_fd = sl_open_write(file_path('D', 'W'), SL_YESPRIV))) {
-            SH_FREE(fullpath);
-            SH_FREE(linkpath);
-            sh_error_handle((-1), FIL__, __LINE__, pushdata_fd, MSG_E_ACCESS,
-                            geteuid(), file_path('D', 'W'));
-            SL_RET0(_("sh_hash_pushdata"));
-          }
-          if ( SL_ISERROR(status = sl_forward(pushdata_fd))) {
-            SH_FREE(fullpath);
-            SH_FREE(linkpath);
-            sh_error_handle((-1), FIL__, __LINE__, status, MSG_E_SUBGPATH,
-                            _("Fast forward failed"), _("sh_hash_pushdata"),
-                            file_path('D', 'W'));
-            SL_RET0(_("sh_hash_pushdata"));
-          }
+      if (pushdata_stdout == S_FALSE && pushdata_fd == -1)
+        {
+          if ( SL_ISERROR(pushdata_fd = sl_open_write(file_path('D', 'W'), SL_YESPRIV))) 
+            {
+              SH_FREE(fullpath);
+              SH_FREE(linkpath);
+              sh_error_handle((-1), FIL__, __LINE__, pushdata_fd, MSG_E_ACCESS,
+                              geteuid(), file_path('D', 'W'));
+              SL_RET0(_("sh_hash_pushdata"));
+            }
+          if ( SL_ISERROR(status = sl_forward(pushdata_fd))) 
+            {
+              SH_FREE(fullpath);
+              SH_FREE(linkpath);
+              sh_error_handle((-1), FIL__, __LINE__, status, MSG_E_SUBGPATH,
+                              _("Fast forward failed"), _("sh_hash_pushdata"),
+                              file_path('D', 'W'));
+              SL_RET0(_("sh_hash_pushdata"));
+            }
         }
     }
@@ -1726 +1727 @@
     {
       sl_write      (pushdata_fd,       &p, sizeof(sh_filestore_t));
-      sl_write_line (pushdata_fd, fullpath,    sl_strlen(fullpath));
-      sl_write_line (pushdata_fd, linkpath,    sl_strlen(linkpath));
+      sl_write_line_fast (pushdata_fd, fullpath, sl_strlen(fullpath));
+      sl_write_line_fast (pushdata_fd, linkpath, sl_strlen(linkpath));
       if (attr_string)
-        sl_write_line (pushdata_fd, attr_string,    sl_strlen(attr_string));
+        sl_write_line_fast (pushdata_fd, attr_string, sl_strlen(attr_string));
     } else {
       fwrite (&p, sizeof(sh_filestore_t), 1, stdout);
@@ -1742 +1743 @@
   if ((sh.flag.update != S_TRUE) && (pushdata_stdout == S_FALSE))
     {
-      sl_close (pushdata_fd);
-      pushdata_fd = -1;
+      if (sh.flag.checkSum != SH_CHECK_INIT || (buf == NULL && fileHash == NULL))
+        {
+          sl_close (pushdata_fd);
+          pushdata_fd = -1;
+        }
     }
 
@@ -3413 +3417 @@
     return 0;
 }
+
+/* Always quote the string, except if it is empty. Qoute quotes by
+ * doubling them.
+ */
+char * csv_escape(const char * str)
+{
+  const  char * p = str;
+  const  char * q;
+
+  size_t size       = 0;
+  size_t flag_quote = 0;
+  int    flag_comma = 0;
+  char * new;
+  char * pnew;
+
+  if (p)
+    {
+
+      while (*p) 
+        {
+          if (*p == ',')
+            flag_comma = 1;
+          else if (*p == '"')
+            ++flag_quote;
+          
+          ++size; ++p;
+        }
+
+      if (sl_ok_adds(size, flag_quote))
+        size += flag_quote;      /* double each quote */
+      else
+        return NULL;
+
+      if (sl_ok_adds(size, 3))
+        size += 3; /* two quotes and terminating null */
+      else
+        return NULL;
+      
+      new = SH_ALLOC(size);
+      
+      if (flag_quote != 0)
+        {
+          new[0] = '"';
+          pnew = &new[1];
+          q    = str;
+          while (*q)
+            {
+              *pnew = *q;
+              if (*pnew == '"')
+                {
+                  ++pnew; *pnew = '"';
+                }
+              ++pnew; ++q;
+            }
+          *pnew = '"'; ++pnew;
+          *pnew = '\0';
+        }
+      else
+        {
+          if (size > 3) 
+            {
+              new[0] = '"';
+              sl_strlcpy (&new[1], str, size-1);
+              new[size-2] = '"';
+              new[size-1] = '\0';
+            }
+          else
+            {
+              new[0] = '\0';
+            }
+        }
+
+      return new;
+    }
+  return NULL;
+}
+
+
  
 void sh_hash_list_db_entry_full_detail (sh_file_t * p)
 {
   char * tmp;
+  char * esc;
   char   str[81];
-  size_t i;
 
   if (ListWithDelimiter == S_TRUE)
@@ -3464 +3546 @@
 
   tmp = sh_util_safe_name(p->fullpath);
-  printf( _(" %s"), tmp);
+  if (ListWithDelimiter != S_TRUE)
+    {
+      printf( _(" %s"), tmp);
+    }
+  else
+    {
+      esc = csv_escape(tmp);
+      printf( _(" %s,"), (esc != NULL) ? esc : _("(null)"));
+      if (esc)
+        SH_FREE(esc);
+    }
   SH_FREE(tmp);
-  if (ListWithDelimiter == S_TRUE)
-    putchar(',');
 
   if ('l' == p->theFile.c_mode[0])
     {
       tmp = sh_util_safe_name(p->linkpath);
-      if (ListWithDelimiter == S_TRUE)
-        printf(_(" %s"), tmp);
+      if (ListWithDelimiter != S_TRUE)
+        {
+          printf(_(" -> %s"), tmp);
+        }
       else
-        printf(_(" -> %s"), tmp);
+        {
+          esc = csv_escape(tmp);
+          printf( _(" %s,"), (esc != NULL) ? esc : _("(null)"));
+          if (esc)
+            SH_FREE(esc);
+        }
       SH_FREE(tmp);
     }
-  if (ListWithDelimiter == S_TRUE)
-    putchar(',');
 
   if (p->attr_string)
     {
       tmp = sh_util_safe_name(p->attr_string);
-      if (ListWithDelimiter == S_TRUE) {
-        for (i = 0; i < strlen(tmp); ++i) 
-          if (tmp[i] == ',') tmp[i] = ';';
-      }
+      if (ListWithDelimiter != S_TRUE) 
+        {
+          printf(_(" %s"), tmp);
+        }
+      else
+        {
+          esc = csv_escape(tmp);
+          printf( _(" %s"), (esc != NULL) ? esc : _("(null)"));
+          if (esc)
+            SH_FREE(esc);
+        }
       printf(_(" %s"), tmp);
       SH_FREE(tmp);