aboutsummaryrefslogtreecommitdiff
path: root/cp_mv.c
diff options
context:
space:
mode:
Diffstat (limited to 'cp_mv.c')
-rw-r--r--cp_mv.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/cp_mv.c b/cp_mv.c
index f4104e573..b43a6d31f 100644
--- a/cp_mv.c
+++ b/cp_mv.c
@@ -74,7 +74,7 @@ static const char *baseSrcName;
74static int srcDirFlag; 74static int srcDirFlag;
75static struct stat srcStatBuf; 75static struct stat srcStatBuf;
76 76
77static char baseDestName[PATH_MAX + 1]; 77static char baseDestName[BUFSIZ + 1];
78static size_t baseDestLen; 78static size_t baseDestLen;
79static int destDirFlag; 79static int destDirFlag;
80static struct stat destStatBuf; 80static struct stat destStatBuf;
@@ -97,12 +97,12 @@ fill_baseDest_buf(char *_buf, size_t * _buflen) {
97 if ((srcBasename = strrchr(baseSrcName, '/')) == NULL) { 97 if ((srcBasename = strrchr(baseSrcName, '/')) == NULL) {
98 srcBasename = baseSrcName; 98 srcBasename = baseSrcName;
99 if (_buf[*_buflen - 1] != '/') { 99 if (_buf[*_buflen - 1] != '/') {
100 if (++(*_buflen) > PATH_MAX) 100 if (++(*_buflen) > BUFSIZ)
101 name_too_long__exit(); 101 name_too_long__exit();
102 strcat(_buf, "/"); 102 strcat(_buf, "/");
103 } 103 }
104 } 104 }
105 if (*_buflen + strlen(srcBasename) > PATH_MAX) 105 if (*_buflen + strlen(srcBasename) > BUFSIZ)
106 name_too_long__exit(); 106 name_too_long__exit();
107 strcat(_buf, srcBasename); 107 strcat(_buf, srcBasename);
108 return; 108 return;
@@ -112,7 +112,7 @@ fill_baseDest_buf(char *_buf, size_t * _buflen) {
112static int 112static int
113cp_mv_Action(const char *fileName, struct stat *statbuf, void* junk) 113cp_mv_Action(const char *fileName, struct stat *statbuf, void* junk)
114{ 114{
115 char destName[PATH_MAX + 1]; 115 char destName[BUFSIZ + 1];
116 size_t destLen; 116 size_t destLen;
117 const char *srcBasename; 117 const char *srcBasename;
118 char *name; 118 char *name;
@@ -128,7 +128,7 @@ cp_mv_Action(const char *fileName, struct stat *statbuf, void* junk)
128 srcBasename = (strstr(fileName, baseSrcName) 128 srcBasename = (strstr(fileName, baseSrcName)
129 + strlen(baseSrcName)); 129 + strlen(baseSrcName));
130 130
131 if (destLen + strlen(srcBasename) > PATH_MAX) { 131 if (destLen + strlen(srcBasename) > BUFSIZ) {
132 fprintf(stderr, name_too_long, dz); 132 fprintf(stderr, name_too_long, dz);
133 return FALSE; 133 return FALSE;
134 } 134 }
@@ -230,7 +230,7 @@ extern int cp_mv_main(int argc, char **argv)
230 followLinks = FALSE; 230 followLinks = FALSE;
231 } 231 }
232 232
233 if (strlen(argv[argc - 1]) > PATH_MAX) { 233 if (strlen(argv[argc - 1]) > BUFSIZ) {
234 fprintf(stderr, name_too_long, "cp"); 234 fprintf(stderr, name_too_long, "cp");
235 goto exit_false; 235 goto exit_false;
236 } 236 }
@@ -252,7 +252,7 @@ extern int cp_mv_main(int argc, char **argv)
252 252
253 baseSrcName = *(argv++); 253 baseSrcName = *(argv++);
254 254
255 if ((srcLen = strlen(baseSrcName)) > PATH_MAX) 255 if ((srcLen = strlen(baseSrcName)) > BUFSIZ)
256 name_too_long__exit(); 256 name_too_long__exit();
257 257
258 if (srcLen == 0) continue; /* "" */ 258 if (srcLen == 0) continue; /* "" */
@@ -266,7 +266,7 @@ extern int cp_mv_main(int argc, char **argv)
266 int state = 0; 266 int state = 0;
267 char *pushd, *d, *p; 267 char *pushd, *d, *p;
268 268
269 if ((pushd = getcwd(NULL, PATH_MAX + 1)) == NULL) { 269 if ((pushd = getcwd(NULL, BUFSIZ + 1)) == NULL) {
270 fprintf(stderr, "%s: getcwd(): %s\n", dz, strerror(errno)); 270 fprintf(stderr, "%s: getcwd(): %s\n", dz, strerror(errno));
271 continue; 271 continue;
272 } 272 }
@@ -274,7 +274,7 @@ extern int cp_mv_main(int argc, char **argv)
274 fprintf(stderr, "%s: chdir(%s): %s\n", dz, baseSrcName, strerror(errno)); 274 fprintf(stderr, "%s: chdir(%s): %s\n", dz, baseSrcName, strerror(errno));
275 continue; 275 continue;
276 } 276 }
277 if ((d = getcwd(NULL, PATH_MAX + 1)) == NULL) { 277 if ((d = getcwd(NULL, BUFSIZ + 1)) == NULL) {
278 fprintf(stderr, "%s: getcwd(): %s\n", dz, strerror(errno)); 278 fprintf(stderr, "%s: getcwd(): %s\n", dz, strerror(errno));
279 continue; 279 continue;
280 } 280 }