Changeset 76 for trunk/src/trustfile.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/trustfile.c (modified) (6 diffs)

trunk/src/trustfile.c

@@ -687 +687 @@
       if (retry_lstat(FIL__, __LINE__, fexp, &stbuf) < 0)
         {
-          (void) strcpy(tf_path, fexp);                  /* known to fit  */
+          (void) strncpy(tf_path, fexp, sizeof(tf_path));
+          tf_path[sizeof(tf_path)-1] = '\0';
 #ifdef TRUST_MAIN
           fprintf(stderr, "---------------------------------------------\n");
-              fprintf(stderr, "trustfile: ESTAT: stat(%s) failed, maybe the file does not exist\n",
-                      fexp);
+          fprintf(stderr, "trustfile: ESTAT: stat(%s) failed,\n", fexp);
+          fprintf(stderr, "maybe the file does not exist\n");
           fprintf(stderr, "---------------------------------------------\n");
 #endif
@@ -781 +782 @@
                   /* yes -- error 
                    */
-                  (void) strcpy(tf_path, fexp);          /* known to fit  */
+                  (void) strncpy(tf_path, fexp, sizeof(tf_path));
+                  tf_path[sizeof(tf_path)-1] = '\0';
 #ifdef TRUST_MAIN
                   fprintf(stderr, "---------------------------------------------\n");
@@ -850 +852 @@
           fprintf(stderr, "---------------------------------------------\n");
 #endif 
-          (void) strcpy(tf_path, fexp);                  /* known to fit  */
+          (void) strncpy(tf_path, fexp, sizeof(tf_path));
+          tf_path[sizeof(tf_path)-1] = '\0';
+
           tf_baduid = (uid_t) stbuf.st_uid;
           SL_IRETURN(SL_EBADUID, _("sl_trustfile"));
@@ -887 +891 @@
           fprintf(stderr, "---------------------------------------------\n");
 #endif 
-          (void) strcpy(tf_path, fexp);                  /* known to fit  */
+          (void) strncpy(tf_path, fexp, sizeof(tf_path));
+          tf_path[sizeof(tf_path)-1] = '\0';
+
           tf_badgid = (gid_t) stbuf.st_gid;
           SL_IRETURN(SL_EBADGID, _("sl_trustfile"));
@@ -909 +915 @@
           fprintf(stderr, "---------------------------------------------\n");
 #endif 
-          (void) strcpy(tf_path, fexp);                  /* known to fit  */
+          (void) strncpy(tf_path, fexp, sizeof(tf_path));
+          tf_path[sizeof(tf_path)-1] = '\0';
+
           SL_IRETURN(SL_EBADOTH, _("sl_trustfile"));
         }
@@ -932 +940 @@
    * yes, it can be trusted
    */
-  (void) strcpy(tf_path, fexp);                      /* known to fit  */
+  (void) strncpy(tf_path, fexp, sizeof(tf_path));
+  tf_path[sizeof(tf_path)-1] = '\0';
+
   SL_IRETURN(SL_ENONE, _("sl_trustfile"));
 }