Apple-2gs-SW
/
gno
mirror of https://github.com/GnoConsortium/gno.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

inst.c: 

Fixed PR#107 (bad output with -V)
inst.1, inst.desc, inst.rez, inst.c:
	Updated version number to 1.3
This commit is contained in:
gdr-ftp 1999-01-16 19:30:56 +00:00
parent 00cd830bd0
commit 36c45596c9
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.bin/install/inst.1
View File

@ -1,8 +1,8 @@
.\" Copyright 1996-1997 Devin Reade <gdr@trenco.gno.org>. .\" Copyright 1996-1997 Devin Reade <gdr@trenco.gno.org>.
.\" .\"
.\" $Id: inst.1,v 1.3 1998/04/24 00:54:02 gdr-ftp Exp $ .\" $Id: inst.1,v 1.4 1999/01/16 19:30:56 gdr-ftp Exp $
.\" .\"
.TH INSTALL 1 "23 April 1998" GNO "Commands and Applications" .TH INSTALL 1 "16 January 1999" GNO "Commands and Applications"
.SH NAME .SH NAME
install \- copy files and set their attributes install \- copy files and set their attributes
.SH SYNOPSIS .SH SYNOPSIS
@ -117,7 +117,7 @@ was left out for efficiency reasons.
.SH VERSION .SH VERSION
This manual page documents This manual page documents
.BR install .BR install
version 1.2. version 1.3.
.SH AUTHOR .SH AUTHOR
Devin Reade <gdr@trenco.gno.org>. Devin Reade <gdr@trenco.gno.org>.
.SH "SEE ALSO" .SH "SEE ALSO"

11
usr.bin/install/inst.c
View File

@ -5,10 +5,10 @@
* For copying and distribution information, see the file "COPYING" * For copying and distribution information, see the file "COPYING"
* accompanying this file. * accompanying this file.
* *
* $Id: inst.c,v 1.5 1998/04/24 00:54:03 gdr-ftp Exp $ * $Id: inst.c,v 1.6 1999/01/16 19:30:56 gdr-ftp Exp $
*/ */
#define VERSION "1.2" #define VERSION "1.3" /* version also in inst.rez, inst.1, inst.desc */
#define EMAIL "<gdr@trenco.gno.org>" #define EMAIL "<gdr@trenco.gno.org>"
#define __USE_DYNAMIC_GSSTRING__ #define __USE_DYNAMIC_GSSTRING__
@ -285,6 +285,7 @@ copyfiles(int argc, char **argv, int action, mode_t mode)
GSStringPtr src, dest, newname; GSStringPtr src, dest, newname;
int total, i, result, printWhen; int total, i, result, printWhen;
unsigned short flags; unsigned short flags;
char sep;
#define PRINT_NEVER 0 /* used for printWhen (verbose mode) */ #define PRINT_NEVER 0 /* used for printWhen (verbose mode) */
#define PRINT_BEFORE 1 #define PRINT_BEFORE 1
#define PRINT_AFTER 2 #define PRINT_AFTER 2
@ -330,9 +331,13 @@ copyfiles(int argc, char **argv, int action, mode_t mode)
} else { } else {
printWhen = PRINT_NEVER; printWhen = PRINT_NEVER;
} }
if (total > 0) {
sep = (strchr(argv[total], ':') != NULL) ? ':' : '/';
}
for (i=0; i<total; i++) { for (i=0; i<total; i++) {
if (printWhen == PRINT_BEFORE) { if (printWhen == PRINT_BEFORE) {
fprintf(stderr, "%s\n", argv[total]); fprintf(stderr, "%s%c%s\n", argv[total], sep,
basename(argv[i]));
} }
if ((src = __C2GSMALLOC(argv[i])) == NULL) { if ((src = __C2GSMALLOC(argv[i])) == NULL) {
err(1, nodup, "source", argv[i]); err(1, nodup, "source", argv[i]);

2
usr.bin/install/inst.desc
View File

@ -1,5 +1,5 @@
Name: install Name: install
Version: 1.2 (23 Apr 98) Version: 1.3 (16 Jan 99)
Shell: GNO Shell: GNO
Author: Devin Reade Author: Devin Reade
Contact: gdr@trenco.gno.org Contact: gdr@trenco.gno.org

4
usr.bin/install/inst.rez
View File

@ -5,7 +5,7 @@
* For copying and distribution information, see the file "COPYING" * For copying and distribution information, see the file "COPYING"
* accompanying this file. * accompanying this file.
* *
* $Id: inst.rez,v 1.5 1998/12/22 16:05:41 gdr-ftp Exp $ * $Id: inst.rez,v 1.6 1999/01/16 19:30:56 gdr-ftp Exp $
*/ */
#include "Types.Rez" #include "Types.Rez"
@ -13,7 +13,7 @@
resource rVersion (0x1, purgeable3, nocrossbank) { resource rVersion (0x1, purgeable3, nocrossbank) {
{ 1, 2, 0, /* version; also in inst.c and inst.desc */ { 1, 3, 0, /* version; also in inst.c, inst.1, and inst.desc */
release, /* development|alpha|beta|final|release */ release, /* development|alpha|beta|final|release */
0 /* non-final release number */ 0 /* non-final release number */
}, },