diff options
Diffstat (limited to 'usr.sbin/pkg_install/lib')
| -rw-r--r-- | usr.sbin/pkg_install/lib/file.c | 8 | ||||
| -rw-r--r-- | usr.sbin/pkg_install/lib/msg.c | 4 | ||||
| -rw-r--r-- | usr.sbin/pkg_install/lib/plist.c | 12 |
3 files changed, 12 insertions, 12 deletions
diff --git a/usr.sbin/pkg_install/lib/file.c b/usr.sbin/pkg_install/lib/file.c index e4c413b..29d969c 100644 --- a/usr.sbin/pkg_install/lib/file.c +++ b/usr.sbin/pkg_install/lib/file.c @@ -1,5 +1,5 @@ #ifndef lint -static const char *rcsid = "$Id: file.c,v 1.8 1995/04/26 15:08:20 jkh Exp $"; +static const char *rcsid = "$Id: file.c,v 1.9 1995/05/10 23:00:16 jkh Exp $"; #endif /* @@ -161,7 +161,7 @@ Boolean connectionAborted = FALSE; static int _fileGetIO(FTP *ftp, int n, char *s ) -{ +{ printf("In IO: %s\n", s); return 0; } @@ -262,7 +262,7 @@ fileFindByPath(char *fname) cp = getenv("PKG_PATH"); while (cp) { char *cp2 = strsep(&cp, ":"); - + snprintf(tmp, FILENAME_MAX, "%s/%s.tgz", cp2 ? cp2 : cp, fname); if (fexists(tmp)) return tmp; @@ -389,7 +389,7 @@ unpack(char *pkg, char *flist) } /* Using fmt, replace all instances of: - * + * * %F With the parameter "name" * %D With the parameter "dir" * %B Return the directory part ("base") of %D/%F diff --git a/usr.sbin/pkg_install/lib/msg.c b/usr.sbin/pkg_install/lib/msg.c index 9e3e8ef..460183e 100644 --- a/usr.sbin/pkg_install/lib/msg.c +++ b/usr.sbin/pkg_install/lib/msg.c @@ -1,5 +1,5 @@ #ifndef lint -static const char *rcsid = "$Id: msg.c,v 1.3 1994/04/05 14:08:47 jkh Exp $"; +static const char *rcsid = "$Id: msg.c,v 1.4 1994/06/01 05:14:19 asami Exp $"; #endif /* @@ -100,4 +100,4 @@ y_or_n(Boolean def, const char *msg, ...) return (ch == 'Y') ? TRUE : FALSE; } - + diff --git a/usr.sbin/pkg_install/lib/plist.c b/usr.sbin/pkg_install/lib/plist.c index bb2dd5d..cb6e4b7 100644 --- a/usr.sbin/pkg_install/lib/plist.c +++ b/usr.sbin/pkg_install/lib/plist.c @@ -1,5 +1,5 @@ #ifndef lint -static const char *rcsid = "$Id: plist.c,v 1.11 1995/04/22 00:14:20 jkh Exp $"; +static const char *rcsid = "$Id: plist.c,v 1.12 1995/04/22 07:41:02 jkh Exp $"; #endif /* @@ -93,7 +93,7 @@ find_plist(Package *pkg, plist_t type) } return NULL; } - + /* Look for a specific boolean option argument in the list */ char * find_plist_option(Package *pkg, char *name) @@ -139,7 +139,7 @@ delete_plist(Package *pkg, Boolean all, plist_t type, char *name) p = p->next; } } - + /* Allocate a new packing list entry */ PackingList new_plist_entry(void) @@ -253,7 +253,7 @@ read_plist(Package *pkg, FILE *fp) cp = NULL; } else - cmd = PLIST_FILE; + cmd = PLIST_FILE; add_plist(pkg, cmd, cp); } } @@ -381,7 +381,7 @@ delete_package(Boolean ign_err, Boolean nukedirs, Package *pkg) if (Verbose) printf("Delete%s %s\n", p->type == PLIST_FILE ? "" : " directory", full_name); - + if (!Fake && delete_hierarchy(full_name, ign_err, p->type == PLIST_DIR_RM ? FALSE : nukedirs)) { whinge("Unable to completely remove file '%s'", full_name); @@ -407,7 +407,7 @@ int delete_hierarchy(char *dir, Boolean ign_err, Boolean nukedirs) { char *cp1, *cp2; - + cp1 = cp2 = dir; if (!fexists(dir)) { if (!ign_err) |
