X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fmisc.c;h=bae6cfc1ef0a092d83133d763d35512086048ef8;hb=463d99453f51ac4ae875d9bae97418671e7a62bc;hp=bca569a5a8c11681600eaeb978ee6e8c25b9ecf7;hpb=d2d5d64cb4c1551000a7246ea7dc2acf008d9e6c;p=chaz%2Ftar diff --git a/src/misc.c b/src/misc.c index bca569a..bae6cfc 100644 --- a/src/misc.c +++ b/src/misc.c @@ -203,32 +203,33 @@ unquote_string (char *string) static char *before_backup_name; static char *after_backup_name; -/* Return 1 if PATH is obviously "." or "/". */ +/* Return 1 if FILE_NAME is obviously "." or "/". */ static bool -must_be_dot_or_slash (char const *path) +must_be_dot_or_slash (char const *file_name) { - path += FILESYSTEM_PREFIX_LEN (path); + file_name += FILESYSTEM_PREFIX_LEN (file_name); - if (ISSLASH (path[0])) + if (ISSLASH (file_name[0])) { for (;;) - if (ISSLASH (path[1])) - path++; - else if (path[1] == '.' && ISSLASH (path[2 + (path[2] == '.')])) - path += 2 + (path[2] == '.'); + if (ISSLASH (file_name[1])) + file_name++; + else if (file_name[1] == '.' + && ISSLASH (file_name[2 + (file_name[2] == '.')])) + file_name += 2 + (file_name[2] == '.'); else - return ! path[1]; + return ! file_name[1]; } else { - while (path[0] == '.' && ISSLASH (path[1])) + while (file_name[0] == '.' && ISSLASH (file_name[1])) { - path += 2; - while (ISSLASH (*path)) - path++; + file_name += 2; + while (ISSLASH (*file_name)) + file_name++; } - return ! path[0] || (path[0] == '.' && ! path[1]); + return ! file_name[0] || (file_name[0] == '.' && ! file_name[1]); } } @@ -236,32 +237,32 @@ must_be_dot_or_slash (char const *path) Report an error with errno set to zero for obvious cases of this; otherwise call rmdir. */ static int -safer_rmdir (const char *path) +safer_rmdir (const char *file_name) { - if (must_be_dot_or_slash (path)) + if (must_be_dot_or_slash (file_name)) { errno = 0; return -1; } - return rmdir (path); + return rmdir (file_name); } -/* Remove PATH, returning 1 on success. If PATH is a directory, then - if OPTION is RECURSIVE_REMOVE_OPTION is set remove PATH - recursively; otherwise, remove it only if it is empty. If PATH is +/* Remove FILE_NAME, returning 1 on success. If FILE_NAME is a directory, + then if OPTION is RECURSIVE_REMOVE_OPTION is set remove FILE_NAME + recursively; otherwise, remove it only if it is empty. If FILE_NAME is a directory that cannot be removed (e.g., because it is nonempty) and if OPTION is WANT_DIRECTORY_REMOVE_OPTION, then return -1. - Return 0 on error, with errno set; if PATH is obviously the working + Return 0 on error, with errno set; if FILE_NAME is obviously the working directory return zero with errno set to zero. */ int -remove_any_file (const char *path, enum remove_option option) +remove_any_file (const char *file_name, enum remove_option option) { /* Try unlink first if we are not root, as this saves us a system call in the common case where we're removing a non-directory. */ if (! we_are_root) { - if (unlink (path) == 0) + if (unlink (file_name) == 0) return 1; /* POSIX 1003.1-2001 requires EPERM when attempting to unlink a @@ -271,13 +272,13 @@ remove_any_file (const char *path, enum remove_option option) return 0; } - if (safer_rmdir (path) == 0) + if (safer_rmdir (file_name) == 0) return 1; switch (errno) { case ENOTDIR: - return we_are_root && unlink (path) == 0; + return we_are_root && unlink (file_name) == 0; case 0: case EEXIST: @@ -294,7 +295,7 @@ remove_any_file (const char *path, enum remove_option option) case RECURSIVE_REMOVE_OPTION: { - char *directory = savedir (path); + char *directory = savedir (file_name); char const *entry; size_t entrylen; @@ -305,10 +306,10 @@ remove_any_file (const char *path, enum remove_option option) (entrylen = strlen (entry)) != 0; entry += entrylen + 1) { - char *path_buffer = new_name (path, entry); - int r = remove_any_file (path_buffer, 1); + char *file_name_buffer = new_name (file_name, entry); + int r = remove_any_file (file_name_buffer, 1); int e = errno; - free (path_buffer); + free (file_name_buffer); if (! r) { @@ -319,7 +320,7 @@ remove_any_file (const char *path, enum remove_option option) } free (directory); - return safer_rmdir (path) == 0; + return safer_rmdir (file_name) == 0; } } break; @@ -328,28 +329,28 @@ remove_any_file (const char *path, enum remove_option option) return 0; } -/* Check if PATH already exists and make a backup of it right now. +/* Check if FILE_NAME already exists and make a backup of it right now. Return success (nonzero) only if the backup is either unneeded, or successful. For now, directories are considered to never need backup. If THIS_IS_THE_ARCHIVE is nonzero, this is the archive and so, we do not have to backup block or character devices, nor remote entities. */ bool -maybe_backup_file (const char *path, int this_is_the_archive) +maybe_backup_file (const char *file_name, int this_is_the_archive) { struct stat file_stat; /* Check if we really need to backup the file. */ - if (this_is_the_archive && _remdev (path)) + if (this_is_the_archive && _remdev (file_name)) return true; - if (stat (path, &file_stat)) + if (stat (file_name, &file_stat)) { if (errno == ENOENT) return true; - stat_error (path); + stat_error (file_name); return false; } @@ -360,7 +361,7 @@ maybe_backup_file (const char *path, int this_is_the_archive) && (S_ISBLK (file_stat.st_mode) || S_ISCHR (file_stat.st_mode))) return true; - assign_string (&before_backup_name, path); + assign_string (&before_backup_name, file_name); /* A run situation may exist between Emacs or other GNU programs trying to make a backup for the same file simultaneously. If theoretically @@ -368,7 +369,7 @@ maybe_backup_file (const char *path, int this_is_the_archive) convention, GNU-wide, for all programs doing backups. */ assign_string (&after_backup_name, 0); - after_backup_name = find_backup_file_name (path, backup_type); + after_backup_name = find_backup_file_name (file_name, backup_type); if (! after_backup_name) xalloc_die ();