diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2016-05-16 11:50:19 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2016-05-16 11:50:19 +0300 |
commit | 35b292ac4bb4874f238a12460a06fdcc1df4fbf3 (patch) | |
tree | c007d59ede7f38c684770aa591d49037698f9cad | |
parent | 61cd3fd26855d40ee3a6491b2aa3611cd2aae46c (diff) | |
download | tar-35b292ac4bb4874f238a12460a06fdcc1df4fbf3.tar.gz |
Minor fix
* src/names.c (new_name): rename to make_file_name. All uses changed.
-rw-r--r-- | src/common.h | 2 | ||||
-rw-r--r-- | src/incremen.c | 2 | ||||
-rw-r--r-- | src/list.c | 2 | ||||
-rw-r--r-- | src/misc.c | 2 | ||||
-rw-r--r-- | src/names.c | 20 |
5 files changed, 14 insertions, 14 deletions
diff --git a/src/common.h b/src/common.h index 2337b0e2..50c34cc7 100644 --- a/src/common.h +++ b/src/common.h @@ -752,7 +752,7 @@ void collect_and_sort_names (void); struct name *name_scan (const char *name); struct name const *name_from_list (void); void blank_name_list (void); -char *new_name (const char *dir_name, const char *name); +char *make_file_name (const char *dir_name, const char *name); size_t stripped_prefix_len (char const *file_name, size_t num); bool all_names_found (struct tar_stat_info *st); diff --git a/src/incremen.c b/src/incremen.c index 2cbd16f8..19d0b9bc 100644 --- a/src/incremen.c +++ b/src/incremen.c @@ -1712,7 +1712,7 @@ try_purge_directory (char const *directory_name) const char *entry; struct stat st; free (p); - p = new_name (directory_name, cur); + p = make_file_name (directory_name, cur); if (deref_stat (p, &st) != 0) { @@ -133,7 +133,7 @@ enforce_one_top_level (char **pfile_name) return; } - *pfile_name = new_name (one_top_level_dir, file_name); + *pfile_name = make_file_name (one_top_level_dir, file_name); normalize_filename_x (*pfile_name); } else @@ -657,7 +657,7 @@ remove_any_file (const char *file_name, enum remove_option option) (entrylen = strlen (entry)) != 0; entry += entrylen + 1) { - char *file_name_buffer = new_name (file_name, entry); + char *file_name_buffer = make_file_name (file_name, entry); int r = remove_any_file (file_name_buffer, RECURSIVE_REMOVE_OPTION); int e = errno; diff --git a/src/names.c b/src/names.c index b7f7f499..037b869d 100644 --- a/src/names.c +++ b/src/names.c @@ -1776,18 +1776,18 @@ blank_name_list (void) name->found_count = 0; } -/* Yield a newly allocated file name consisting of FILE_NAME concatenated to - NAME, with an intervening slash if FILE_NAME does not already end in one. */ +/* Yield a newly allocated file name consisting of DIR_NAME concatenated to + NAME, with an intervening slash if DIR_NAME does not already end in one. */ char * -new_name (const char *file_name, const char *name) +make_file_name (const char *directory_name, const char *name) { - size_t file_name_len = strlen (file_name); - size_t namesize = strlen (name) + 1; - int slash = file_name_len && ! ISSLASH (file_name[file_name_len - 1]); - char *buffer = xmalloc (file_name_len + slash + namesize); - memcpy (buffer, file_name, file_name_len); - buffer[file_name_len] = '/'; - memcpy (buffer + file_name_len + slash, name, namesize); + size_t dirlen = strlen (directory_name); + size_t namelen = strlen (name) + 1; + int slash = dirlen && ! ISSLASH (directory_name[dirlen - 1]); + char *buffer = xmalloc (dirlen + slash + namelen); + memcpy (buffer, directory_name, dirlen); + buffer[dirlen] = '/'; + memcpy (buffer + dirlen + slash, name, namelen); return buffer; } |