Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some people are now using rsync as a public server, using various
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
6ef990c
..
d298db1
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-159,8
+159,8
@@
void send_file_entry_v11(struct file_struct *file,int f)
last_gid = file->gid;
last_time = file->modtime;
last_gid = file->gid;
last_time = file->modtime;
- str
cpy(lastname,file->name
);
- lastname[
255
] = 0;
+ str
ncpy(lastname,file->name,MAXPATHLEN-1
);
+ lastname[
MAXPATHLEN-1
] = 0;
}
}
@@
-229,8
+229,8
@@
void receive_file_entry_v11(struct file_struct *file,
last_gid = file->gid;
last_time = file->modtime;
last_gid = file->gid;
last_time = file->modtime;
- str
cpy(lastname,file->name
);
- lastname[
255
] = 0;
+ str
ncpy(lastname,file->name,MAXPATHLEN-1
);
+ lastname[
MAXPATHLEN-1
] = 0;
}
}
@@
-357,7
+357,8
@@
static void send_directory(int f,struct file_list *flist,char *dir)
return;
}
return;
}
- strcpy(fname,dir);
+ strncpy(fname,dir,MAXPATHLEN-1);
+ fname[MAXPATHLEN-1]=0;
l = strlen(fname);
if (fname[l-1] != '/')
strcat(fname,"/");
l = strlen(fname);
if (fname[l-1] != '/')
strcat(fname,"/");
@@
-372,7
+373,7
@@
static void send_directory(int f,struct file_list *flist,char *dir)
if (strcmp(di->d_name,".")==0 ||
strcmp(di->d_name,"..")==0)
continue;
if (strcmp(di->d_name,".")==0 ||
strcmp(di->d_name,"..")==0)
continue;
- str
cpy(p,di->d_name
);
+ str
ncpy(p,di->d_name,MAXPATHLEN-l
);
send_file_name(f,flist,fname);
}
send_file_name(f,flist,fname);
}
@@
-407,7
+408,8
@@
struct file_list *send_file_list(int f,int argc,char *argv[])
char fname2[MAXPATHLEN];
char *fname = fname2;
char fname2[MAXPATHLEN];
char *fname = fname2;
- strcpy(fname,argv[i]);
+ strncpy(fname,argv[i],MAXPATHLEN-1);
+ fname[MAXPATHLEN-1] = 0;
l = strlen(fname);
if (l != 1 && fname[l-1] == '/') {
l = strlen(fname);
if (l != 1 && fname[l-1] == '/') {