ソースを参照

update-alternatives: can_replace_link() → can_replace_path()

alternative_can_replace_path() is clearer than
alternative_can_replace_link() since the function can also allow replacing
files which aren't links.
Raphaël Hertzog 15 年 前
コミット
4e4d2e3908
共有1 個のファイルを変更した5 個の追加5 個の削除を含む
  1. 5 5
      utils/update-alternatives.c

+ 5 - 5
utils/update-alternatives.c

@@ -1624,7 +1624,7 @@ alternative_commit(struct alternative *a)
 }
 
 static bool
-alternative_can_replace_link(const char *linkname)
+alternative_can_replace_path(const char *linkname)
 {
 	struct stat st;
 	bool replace_link;
@@ -1655,7 +1655,7 @@ alternative_prepare_install_single(struct alternative *a, const char *name,
 	alternative_add_commit_op(a, opcode_mv, fntmp, fn);
 	free(fntmp);
 
-	if (alternative_can_replace_link(linkname)) {
+	if (alternative_can_replace_path(linkname)) {
 		/* Create alternative link. */
 		xasprintf(&fntmp, "%s" DPKG_TMP_EXT, linkname);
 		checked_rm(fntmp);
@@ -1701,7 +1701,7 @@ alternative_prepare_install(struct alternative *a, const char *choice)
 
 		/* Drop unused slave. */
 		xasprintf(&fn, "%s/%s", altdir, sl->name);
-		if (alternative_can_replace_link(sl->link))
+		if (alternative_can_replace_path(sl->link))
 			alternative_add_commit_op(a, opcode_rm, sl->link, NULL);
 		else
 			warning(_("not removing %s since it's not a symlink."),
@@ -1717,7 +1717,7 @@ alternative_remove(struct alternative *a)
 	struct slave_link *sl;
 
 	checked_rm_args("%s" DPKG_TMP_EXT, a->master_link);
-	if (alternative_can_replace_link(a->master_link))
+	if (alternative_can_replace_path(a->master_link))
 		checked_rm(a->master_link);
 
 	checked_rm_args("%s/%s" DPKG_TMP_EXT, altdir, a->master_name);
@@ -1725,7 +1725,7 @@ alternative_remove(struct alternative *a)
 
 	for (sl = a->slaves; sl; sl = sl->next) {
 		checked_rm_args("%s" DPKG_TMP_EXT, sl->link);
-		if (alternative_can_replace_link(sl->link))
+		if (alternative_can_replace_path(sl->link))
 			checked_rm(sl->link);
 
 		checked_rm_args("%s/%s" DPKG_TMP_EXT, altdir, sl->name);