Changeset 533 for trunk/client/src/smbwrp.c

Timestamp:

Jan 26, 2011, 3:31:18 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Client 2.1: degug changes, attemp to fix the trap

File:

• trunk/client/src/smbwrp.c (modified) (6 diffs)

trunk/client/src/smbwrp.c

@@ -1113 +1113 @@
         }
 
-        ZERO_STRUCTP(finfo);
+/*      ZERO_STRUCTP(finfo); */
+        finfo->atime = 0;
+        finfo->ctime = 0;
+        finfo->mtime = 0;
+        *finfo->fname = '\0';
         
         switch (level) {
@@ -1157 +1161 @@
                         p += ret;
                         finfo->easize = -1;
-                        strncpy(finfo->fname, fname, sizeof(finfo->fname) -1);
+                        strncat(finfo->fname, fname, sizeof(finfo->fname) -1);
                         return PTR_DIFF(p, base);
 
@@ -1185 +1189 @@
                         }
                         p += ret;
-                        strncpy(finfo->fname, fname, sizeof(finfo->fname) -1);
+                        strncat(finfo->fname, fname, sizeof(finfo->fname) -1);
                         return PTR_DIFF(p, base) + 1;
                         
@@ -1246 +1250 @@
                                 return pdata_end - base;
                         }
-                        strncpy(finfo->fname, fname, sizeof(finfo->fname) -1);
+                        strncat(finfo->fname, fname, sizeof(finfo->fname) -1);
 
                         /* To be robust in the face of unicode conversion failures
@@ -1469 +1473 @@
                                                         &resume_key, &last_name_raw);
 
+                        debuglocal(9, "fname %s (remove me 1)\n", finfo.fname);
                         if (!finfo.fname) {
                                 debuglocal(0,"Error: unable to parse name from info level %d\n",
@@ -1537 +1542 @@
                         p += _os2_interpret_long_filename(frame, cli, info_level, p, rdata_end,
                                                      &finfo,NULL,NULL);
+                        debuglocal(9, "fname %s (remove me 2)\n", finfo.fname);
                         if (!finfo.fname) {
                                 debuglocal(0,"list_new: unable to parse name from info level %d\n",