Changeset 282 for branches/samba-3.2.x/source/client

Timestamp:

Jun 24, 2009, 10:34:52 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 to 3.2.13

File:

• branches/samba-3.2.x/source/client/client.c (modified) (18 diffs)

branches/samba-3.2.x/source/client/client.c

@@ -365 +365 @@
         /* Ensure cur_dir ends in a DIRSEP */
         if ((new_cd[0] != '\0') && (*(new_cd+strlen(new_cd)-1) != CLI_DIRSEP_CHAR)) {
-                new_cd = talloc_asprintf_append(new_cd, CLI_DIRSEP_STR);
+                new_cd = talloc_asprintf_append(new_cd, "%s", CLI_DIRSEP_STR);
                 if (!new_cd) {
                         goto out;
@@ -872 +872 @@
                         mask = talloc_strdup(ctx, buf);
                 } else {
-                        mask = talloc_asprintf_append(mask, buf);
+                        mask = talloc_asprintf_append(mask, "%s", buf);
                 }
         } else {
@@ -913 +913 @@
         }
         if ((mask[0] != '\0') && (mask[strlen(mask)-1]!=CLI_DIRSEP_CHAR)) {
-                mask = talloc_asprintf_append(mask, CLI_DIRSEP_STR);
+                mask = talloc_asprintf_append(mask, "%s", CLI_DIRSEP_STR);
                 if (!mask) {
                         return 1;
@@ -924 +924 @@
                         mask = talloc_strdup(ctx, buf);
                 } else {
-                        mask = talloc_asprintf_append(mask, buf);
+                        mask = talloc_asprintf_append(mask, "%s", buf);
                 }
         } else {
@@ -1108 +1108 @@
                 return 1;
         }
-        rname = talloc_asprintf_append(rname, fname);
+        rname = talloc_asprintf_append(rname, "%s", fname);
         if (!rname) {
                 return 1;
@@ -1267 +1267 @@
                 return 1;
         }
-        rname = talloc_asprintf_append(rname, fname);
+        rname = talloc_asprintf_append(rname, "%s", fname);
         if (!rname) {
                 return 1;
@@ -1319 +1319 @@
                 } else {
                         mget_mask = talloc_asprintf_append(mget_mask,
-                                                        buf);
+                                                        "%s", buf);
                 }
                 if (!mget_mask) {
@@ -1420 +1420 @@
                 return 1;
         }
-        mask = talloc_asprintf_append(mask, buf);
+        mask = talloc_asprintf_append(mask, "%s", buf);
         if (!mask) {
                 return 1;
@@ -1449 +1449 @@
                 p = strtok_r(ddir, "/\\", &saveptr);
                 while (p) {
-                        ddir2 = talloc_asprintf_append(ddir2, p);
+                        ddir2 = talloc_asprintf_append(ddir2, "%s", p);
                         if (!ddir2) {
                                 return 1;
@@ -1456 +1456 @@
                                 do_mkdir(ddir2);
                         }
-                        ddir2 = talloc_asprintf_append(ddir2, CLI_DIRSEP_STR);
+                        ddir2 = talloc_asprintf_append(ddir2, "%s", CLI_DIRSEP_STR);
                         if (!ddir2) {
                                 return 1;
@@ -1488 +1488 @@
                 return 1;
         }
-        name = talloc_asprintf_append(name, buf);
+        name = talloc_asprintf_append(name, "%s", buf);
         if (!name) {
                 return 1;
@@ -1572 +1572 @@
                 return 1;
         }
-        name = talloc_asprintf_append(name, buf);
+        name = talloc_asprintf_append(name, "%s", buf);
         if (!name) {
                 return 1;
@@ -1739 +1739 @@
 
         if (next_token_talloc(ctx, &cmd_ptr,&buf,NULL)) {
-                rname = talloc_asprintf_append(rname, buf);
+                rname = talloc_asprintf_append(rname, "%s", buf);
         } else {
-                rname = talloc_asprintf_append(rname, lname);
+                rname = talloc_asprintf_append(rname, "%s", lname);
         }
         if (!rname) {
@@ -2138 +2138 @@
                 return 1;
         }
-        mask = talloc_asprintf_append(mask, buf);
+        mask = talloc_asprintf_append(mask, "%s", buf);
         if (!mask) {
                 return 1;
@@ -3530 +3530 @@
                 return 1;
         }
-        remote_name = talloc_asprintf_append(remote_name, fname);
+        remote_name = talloc_asprintf_append(remote_name, "%s", fname);
         if (!remote_name) {
                 return 1;
@@ -3577 +3577 @@
         if (next_token_talloc(ctx, &cmd_ptr, &buf, NULL)) {
                 remote_name = talloc_asprintf_append(remote_name,
-                                                buf);
+                                                "%s", buf);
         } else {
                 remote_name = talloc_asprintf_append(remote_name,
-                                                local_name);
+                                                "%s", local_name);
         }
         if (!remote_name) {
@@ -4113 +4113 @@
                                 return;
                         }
-                        tmp = talloc_asprintf_append(tmp, f->name);
+                        tmp = talloc_asprintf_append(tmp, "%s", f->name);
                         if (!tmp) {
                                 TALLOC_FREE(ctx);
@@ -4119 +4119 @@
                         }
                         if (f->mode & aDIR) {
-                                tmp = talloc_asprintf_append(tmp, CLI_DIRSEP_STR);
+                                tmp = talloc_asprintf_append(tmp, "%s", CLI_DIRSEP_STR);
                         }
                         if (!tmp) {