mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-17 18:02:09 +03:00
(linkfunc): Remove. This method ran into a compiler/linker
bug in Interix. Just call symlink or link directly. All uses changed.
This commit is contained in:
1 parent
cec6e43aae
commit
e26a29be00
1 file changed
+4
-11
@@ -60,10 +60,6 @@ char *program_name;
|
||||
/* FIXME: document */
|
||||
static enum backup_type backup_type;
|
||||
|
||||
/* A pointer to the function used to make links. This will point to either
|
||||
`link' or `symlink'. */
|
||||
static int (*linkfunc) ();
|
||||
|
||||
/* If true, make symbolic links; otherwise, make hard links. */
|
||||
static bool symbolic_link;
|
||||
|
||||
@@ -241,7 +237,8 @@ do_link (const char *source, const char *dest)
|
||||
}
|
||||
}
|
||||
|
||||
ok = (linkfunc (source, dest) == 0);
|
||||
ok = ((symbolic_link ? symlink (source, dest) : link (source, dest))
|
||||
== 0);
|
||||
|
||||
/* If the attempt to create a link failed and we are removing or
|
||||
backing up destinations, unlink the destination and try again.
|
||||
@@ -270,7 +267,8 @@ do_link (const char *source, const char *dest)
|
||||
return false;
|
||||
}
|
||||
|
||||
ok = (linkfunc (source, dest) == 0);
|
||||
ok = ((symbolic_link ? symlink (source, dest) : link (source, dest))
|
||||
== 0);
|
||||
}
|
||||
|
||||
if (ok)
|
||||
@@ -506,11 +504,6 @@ main (int argc, char **argv)
|
||||
quote (file[n_files - 1]));
|
||||
}
|
||||
|
||||
if (symbolic_link)
|
||||
linkfunc = symlink;
|
||||
else
|
||||
linkfunc = link;
|
||||
|
||||
if (backup_suffix_string)
|
||||
simple_backup_suffix = xstrdup (backup_suffix_string);
|
||||
|
||||
|
||||
Reference in new issue
Block a user