Changeset 33977 in vbox for trunk/src/VBox/RDP/client

Timestamp:

Nov 11, 2010 11:42:07 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

67639

Message:

*: replaced a bunch of sprintf() by snprintf()

Location:

trunk/src/VBox/RDP/client

Files:

• disk.c (modified) (3 diffs)
• printer.c (modified) (1 diff)
• rdesktop.c (modified) (3 diffs)

trunk/src/VBox/RDP/client/disk.c

@@ -364 +364 @@
         if (*filename && filename[strlen(filename) - 1] == '/')
                 filename[strlen(filename) - 1] = 0;
+#ifdef VBOX
+        snprintf(path, sizeof(path),  "%s%s", g_rdpdr_device[device_id].local_path, filename);
+#else
         sprintf(path, "%s%s", g_rdpdr_device[device_id].local_path, filename);
+#endif
 
         switch (create_disposition)
@@ -820 +824 @@
                         }
 
+#ifdef VBOX
+                        snprintf(fullpath, sizeof(fullpath), "%s%s", g_rdpdr_device[pfinfo->device_id].local_path,
+                                newname);
+#else
                         sprintf(fullpath, "%s%s", g_rdpdr_device[pfinfo->device_id].local_path,
                                 newname);
+#endif
 
                         if (rename(pfinfo->path, fullpath) != 0)
@@ -1156 +1165 @@
 
                         /* Get information for directory entry */
+#ifdef VBOX
+                        snprintf(fullpath, sizeof(fullpath), "%s/%s", dirname, pdirent->d_name);
+#else
                         sprintf(fullpath, "%s/%s", dirname, pdirent->d_name);
+#endif
 
                         if (stat(fullpath, &filestat))

trunk/src/VBox/RDP/client/printer.c

@@ -126 +126 @@
         else
         {
+#ifdef VBOX
+                snprintf(cmd, sizeof(cmd), "lpr -P %s", pprinter_data->printer);
+#else
                 sprintf(cmd, "lpr -P %s", pprinter_data->printer);
+#endif
                 pprinter_data->printer_fp = popen(cmd, "w");
         }

trunk/src/VBox/RDP/client/rdesktop.c

@@ -1594 +1594 @@
                 return False;
 
+#ifdef VBOX
+        snprintf(bmpcache_dir, sizeof(bmpcache_dir), "%s/%s", home, ".rdesktop");
+#else
         sprintf(bmpcache_dir, "%s/%s", home, ".rdesktop");
+#endif
 
         if ((mkdir(bmpcache_dir, S_IRWXU) == -1) && errno != EEXIST)
@@ -1602 +1606 @@
         }
 
+#ifdef VBOX
+        snprintf(bmpcache_dir, sizeof(bmpcache_dir), "%s/%s", home, ".rdesktop/cache");
+#else
         sprintf(bmpcache_dir, "%s/%s", home, ".rdesktop/cache");
+#endif
 
         if ((mkdir(bmpcache_dir, S_IRWXU) == -1) && errno != EEXIST)
@@ -1624 +1632 @@
         if (home == NULL)
                 return -1;
+#ifdef VBOX
+        snprintf(fn, sizeof(fn), "%s/.rdesktop/%s", home, filename);
+#else
         sprintf(fn, "%s/.rdesktop/%s", home, filename);
+#endif
         fd = open(fn, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
         if (fd == -1)