diff options
| author | Jeremy Allison <jra@samba.org> | 2004-12-16 21:06:33 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:53:39 -0500 |
| commit | 46f0e330f1e455e3338a7e7a3b7a287df752fe1a (patch) | |
| tree | 93d59a549342510bf6e11cc1203b33286d3fe7f3 /source3/utils/smbget.c | |
| parent | 9fd22239ed55d82261c30f788b1c8b3c09109b36 (diff) | |
| download | samba-46f0e330f1e455e3338a7e7a3b7a287df752fe1a.tar.gz samba-46f0e330f1e455e3338a7e7a3b7a287df752fe1a.tar.bz2 samba-46f0e330f1e455e3338a7e7a3b7a287df752fe1a.zip | |
r4234: More malloc fixes to use the macros.
Jeremy.
(This used to be commit 61479f56be60a3c2ae0f7b931335cb1da77540c2)
Diffstat (limited to 'source3/utils/smbget.c')
| -rw-r--r-- | source3/utils/smbget.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/utils/smbget.c b/source3/utils/smbget.c index 64630bba8f..2aca3001a3 100644 --- a/source3/utils/smbget.c +++ b/source3/utils/smbget.c @@ -128,7 +128,7 @@ int smb_download_dir(const char *base, const char *name, int resume) while(*relname == '/')relname++; mkdir(relname, 0755); - tmpname = strdup(name); + tmpname = SMB_STRDUP(name); while((dirent = smbc_readdir(dirhandle))) { char *newname; @@ -231,7 +231,7 @@ void print_progress(const char *name, time_t start, time_t now, off_t start_pos, int required = strlen(name), available = columns - len - strlen("[] "); if(required > available) asprintf(&filename, "...%s", name + required - available + 3); else filename = strndup(name, available); - } else filename = strdup(name); + } else filename = SMB_STRDUP(name); fprintf(stderr, "\r[%s] %s", filename, status); @@ -376,7 +376,7 @@ int smb_download_file(const char *base, const char *name, int recursive, int res offset_check = 0; } - readbuf = malloc(blocksize); + readbuf = SMB_MALLOC(blocksize); /* Now, download all bytes from offset_download to the end */ for(curpos = offset_download; curpos < remotestat.st_size; curpos+=blocksize) { @@ -487,7 +487,7 @@ int readrcfile(const char *name, const struct poptOption long_options[]) break; case POPT_ARG_STRING: stringdata = (char **)long_options[i].arg; - *stringdata = strdup(val); + *stringdata = SMB_STRDUP(val); break; default: fprintf(stderr, "Invalid variable %s at line %d in %s\n", var, lineno, name); |