From: Jim Meyering Date: Sun, 4 Jul 2004 17:47:09 +0000 (+0000) Subject: (do_copy): Assume path_concat returns non-NULL. X-Git-Tag: v5.3.0~1169 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae206c4b1c6ca22345e20da3aa52b1aefec988bc;p=thirdparty%2Fcoreutils.git (do_copy): Assume path_concat returns non-NULL. (make_path_private): 2nd arg is now size_t, not int, to avoid problem when path_concat dir name is longer than 2 GiB (!). --- diff --git a/src/cp.c b/src/cp.c index b2a85c2f0b..9563b149f6 100644 --- a/src/cp.c +++ b/src/cp.c @@ -371,7 +371,7 @@ re_protect (const char *const_dst_path, int src_offset, /* FIXME: find a way to synch this function with the one in lib/makepath.c. */ static int -make_path_private (const char *const_dirpath, int src_offset, int mode, +make_path_private (const char *const_dirpath, size_t src_offset, int mode, const char *verbose_fmt_string, struct dir_attr **attr_list, int *new_dst, int (*xstat)()) { @@ -582,8 +582,6 @@ do_copy (int n_files, char **file, const char *target_directory, /* Append all of `arg' (minus any trailing slash) to `dest'. */ dst_path = path_concat (target_directory, arg_no_trailing_slash, &arg_in_concat); - if (dst_path == NULL) - xalloc_die (); /* For --parents, we have to make sure that the directory dir_name (dst_path) exists. We may have to create a few