Changeset 745 for trunk/server/source3/utils/smbget.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/utils/smbget.c (modified) (18 diffs)

trunk/server/source3/utils/smbget.c

@@ -8 +8 @@
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "popt_common.h"
 #include "libsmbclient.h"
 
@@ -50 +52 @@
 static int blocksize = SMB_DEFAULT_BLOCKSIZE;
 
-static int smb_download_file(const char *base, const char *name, int recursive, int resume, char *outfile);
+static int smb_download_file(const char *base, const char *name, int recursive,
+                             int resume, int toplevel, char *outfile);
 
 static int get_num_cols(void)
@@ -75 +78 @@
 static void human_readable(off_t s, char *buffer, int l)
 {
-        if(s > 1024 * 1024 * 1024) snprintf(buffer, l, "%.2fGB",
-                                            1.0 * s / (1024 * 1024 * 1024));
-        else if(s > 1024 * 1024) snprintf(buffer, l, "%.2fMB",
-                                          1.0 * s / (1024 * 1024));
-        else if(s > 1024) snprintf(buffer, l, "%.2fkB", 1.0 * s / 1024);
-        else snprintf(buffer, l, OFF_T_FORMAT"b", (OFF_T_FORMAT_CAST)s);
+        if (s > 1024 * 1024 * 1024) {
+                snprintf(buffer, l, "%.2fGB", 1.0 * s / (1024 * 1024 * 1024));
+        } else if (s > 1024 * 1024) {
+                snprintf(buffer, l, "%.2fMB", 1.0 * s / (1024 * 1024));
+        } else if (s > 1024) {
+                snprintf(buffer, l, "%.2fkB", 1.0 * s / 1024);
+        } else {
+                snprintf(buffer, l, OFF_T_FORMAT"b", (OFF_T_FORMAT_CAST)s);
+        }
 }
 
@@ -138 +144 @@
         dirhandle = smbc_opendir(path);
         if(dirhandle < 1) {
-                if(errno == ENOTDIR) return smb_download_file(base, name, 1, resume, NULL);
+                if (errno == ENOTDIR) {
+                        return smb_download_file(base, name, 1, resume,
+                                                 0, NULL);
+                }
                 fprintf(stderr, "Can't open directory %s: %s\n", path, strerror(errno));
                 return 1;
@@ -145 +154 @@
         while(*relname == '/')relname++;
         mkdir(relname, 0755);
-        
+
         tmpname = SMB_STRDUP(name);
 
@@ -168 +177 @@
 
                 case SMBC_FILE:
-                        ret = smb_download_file(base, newname, 1, resume, NULL);
+                        ret = smb_download_file(base, newname, 1, resume, 0,
+                                                NULL);
                         break;
 
@@ -182 +192 @@
                         if(!quiet)printf("Ignoring comms share %s\n", dirent->name);
                         break;
-                        
+
                 case SMBC_IPC_SHARE:
                         if(!quiet)printf("Ignoring ipc$ share %s\n", dirent->name);
@@ -201 +211 @@
                         return 1;
                 }
-                
+
                 if(chmod(relname, remotestat.st_mode) < 0) {
                         fprintf(stderr, "Unable to change mode of local dir %s to %o\n", relname,
@@ -250 +260 @@
                 return;
         }
-        
+
         if(columns) {
                 int required = strlen(name), available = columns - len - strlen("[] ");
@@ -269 +279 @@
 /* Return 1 on error, 0 on success. */
 
-static int smb_download_file(const char *base, const char *name, int recursive, int resume, char *outfile) {
+static int smb_download_file(const char *base, const char *name, int recursive,
+                             int resume, int toplevel, char *outfile)
+{
         int remotehandle, localhandle;
-        time_t start_time = time(NULL);
+        time_t start_time = time_mono(NULL);
         const char *newpath;
         char path[SMB_MAXPATHLEN];
@@ -280 +292 @@
 
         snprintf(path, SMB_MAXPATHLEN-1, "%s%s%s", base, (*base && *name && name[0] != '/' && base[strlen(base)-1] != '/')?"/":"", name);
-        
+
         remotehandle = smbc_open(path, O_RDONLY, 0755);
 
@@ -325 +337 @@
         } else newpath = name;
 
-        if(newpath[0] == '/')newpath++;
-        
+        if (!toplevel && (newpath[0] == '/')) {
+                newpath++;
+        }
+
         /* Open local file according to the mode */
         if(update) {
@@ -353 +367 @@
                         return 1;
                 }
-        
+
                 if (fstat(localhandle, &localstat) != 0) {
                         fprintf(stderr, "Can't fstat %s: %s\n", newpath, strerror(errno));
@@ -404 +418 @@
                                         (OFF_T_FORMAT_CAST)off1,
                                         (OFF_T_FORMAT_CAST)off2);
+                                smbc_close(remotehandle); close(localhandle);
                                 return 1;
                         }
@@ -435 +450 @@
 
         readbuf = (char *)SMB_MALLOC(blocksize);
+        if (!readbuf) {
+                return 1;
+        }
 
         /* Now, download all bytes from offset_download to the end */
@@ -459 +477 @@
                 if(dots)fputc('.', stderr);
                 else if(!quiet) {
-                        print_progress(newpath, start_time, time(NULL), start_offset, curpos, remotestat.st_size);
+                        print_progress(newpath, start_time, time_mono(NULL),
+                                        start_offset, curpos, remotestat.st_size);
                 }
         }
@@ -499 +518 @@
         human_readable(total_bytes, bs, sizeof(bs));
         if(!quiet)fprintf(stderr, "Downloaded %s in %lu seconds\n", bs,
-                (unsigned long)(time(NULL) - total_start_time));
+                (unsigned long)(time_mono(NULL) - total_start_time));
         exit(0);
 }
@@ -655 +674 @@
                         "require");
         }
-        
+
         columns = get_num_cols();
 
-        total_start_time = time(NULL);
+        total_start_time = time_mono(NULL);
 
         while ( (file = poptGetArg(pc)) ) {
                 if (!recursive) 
-                        ret = smb_download_file(file, "", recursive, resume, outputfile);
+                        ret = smb_download_file(file, "", recursive, resume,
+                                                1, outputfile);
                 else 
                         ret = smb_download_dir(file, "", resume);