From 4710700ef6a944a886c0a37d01712a521e8c2781 Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Mon, 6 Sep 1993 23:28:42 +0000 Subject: Fixed bug in copying script files from absolute locations --- usr.sbin/pkg_install/lib/file.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'usr.sbin/pkg_install') diff --git a/usr.sbin/pkg_install/lib/file.c b/usr.sbin/pkg_install/lib/file.c index 106a5351564c..2b69bbf2dc8d 100644 --- a/usr.sbin/pkg_install/lib/file.c +++ b/usr.sbin/pkg_install/lib/file.c @@ -110,8 +110,14 @@ write_file(char *name, char *str) void copy_file(char *dir, char *fname, char *to) { - if (vsystem("cp -p -r %s/%s %s", dir, fname, to)) - barf("Couldn't copy %s/%s to %s!", dir, fname, to); + char cmd[FILENAME_MAX]; + + if (fname[0] == '/') + sprintf(cmd, "cp -p -r %s %s", fname, to); + else + sprintf(cmd, "cp -p -r %s/%s %s", dir, fname, to); + if (vsystem(cmd)) + barf("Couldn't perform '%s'", cmd); } /* -- cgit v1.2.3