emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff: improve comments (no code chages)

Browse Source
This commit is contained in:
Denis Vlasenko 2008-03-24 18:40:32 +00:00
parent 64a76d7b44
commit dccfe05e17
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
editors/diff.c
View File

@ -282,6 +282,9 @@ static int readhash(FILE *fp)
} }
/* Our diff implementation is using seek.
* When we meet non-seekable file, we must make a temp copy.
*/
static char *make_temp(FILE *f, struct stat *sb) static char *make_temp(FILE *f, struct stat *sb)
{ {
char *name; char *name;
@ -1160,7 +1163,7 @@ static void do_diff(char *dir1, char *path1, char *dir2, char *path2)
#if ENABLE_FEATURE_DIFF_DIR #if ENABLE_FEATURE_DIFF_DIR
/* This function adds a filename to dl, the directory listing. */ /* This function adds a filename to dl, the directory listing. */
static int add_to_dirlist(const char *filename, static int add_to_dirlist(const char *filename,
struct stat ATTRIBUTE_UNUSED *sb, struct stat *sb ATTRIBUTE_UNUSED,
void *userdata, void *userdata,
int depth ATTRIBUTE_UNUSED) int depth ATTRIBUTE_UNUSED)
{ {
@ -1178,15 +1181,15 @@ static char **get_recursive_dirlist(char *path)
dl_count = 0; dl_count = 0;
dl = xzalloc(sizeof(dl[0])); dl = xzalloc(sizeof(dl[0]));
/* If -r has been set, then the recursive_action function will be /* We need to trim root directory prefix.
* used. Unfortunately, this outputs the root directory along with * Using void *userdata to specify its length,
* the recursed paths, so use void *userdata to specify the string * add_to_dirlist will remove it. */
* length of the root directory - '(void*)(strlen(path)+)'.
* add_to_dirlist then removes root dir prefix. */
if (option_mask32 & FLAG_r) { if (option_mask32 & FLAG_r) {
recursive_action(path, ACTION_RECURSE|ACTION_FOLLOWLINKS, recursive_action(path, ACTION_RECURSE|ACTION_FOLLOWLINKS,
add_to_dirlist, NULL, add_to_dirlist, /* file_action */
(void*)(strlen(path)+1), 0); NULL, /* dir_action */
(void*)(strlen(path) + 1),
0);
} else { } else {
DIR *dp; DIR *dp;
struct dirent *ep; struct dirent *ep;
@ -1328,12 +1331,12 @@ int diff_main(int argc ATTRIBUTE_UNUSED, char **argv)
/* NB: "diff dir dir2/dir3/file" must become /* NB: "diff dir dir2/dir3/file" must become
* "diff dir/file dir2/dir3/file" */ * "diff dir/file dir2/dir3/file" */
char *slash = strrchr(f2, '/'); char *slash = strrchr(f2, '/');
f1 = concat_path_file(f1, slash ? slash+1 : f2); f1 = concat_path_file(f1, slash ? slash + 1 : f2);
xstat(f1, &stb1); xstat(f1, &stb1);
} }
if (S_ISDIR(stb2.st_mode)) { if (S_ISDIR(stb2.st_mode)) {
char *slash = strrchr(f1, '/'); char *slash = strrchr(f1, '/');
f2 = concat_path_file(f2, slash ? slash+1 : f1); f2 = concat_path_file(f2, slash ? slash + 1 : f1);
xstat(f2, &stb2); xstat(f2, &stb2);
} }