diff --git a/usr.orca.bin/describe/README b/usr.orca.bin/describe/README index fe7a6f9..41a3ecb 100644 --- a/usr.orca.bin/describe/README +++ b/usr.orca.bin/describe/README @@ -1,14 +1,14 @@ -$Id: README,v 1.5 1997/12/20 17:14:00 gdr Exp $ +$Id: README,v 1.6 1997/12/22 00:34:51 gdr Exp $ This is the README file for the describe package. This package is -designated as version 1.0.4, and consists of the following utilities: +designated as version 1.0.5, and consists of the following utilities: - describe v1.0.4 - show database entries describing the current - status of programs + describe - show database entries describing the current + status of programs - descc v1.0.4 - the describe source compiler + descc - the describe source compiler - descu v1.0.4 - the describe source updater + descu - the describe source updater ABOUT DESCRIBE AND DESCC ======================== @@ -94,6 +94,11 @@ CHANGES This details changes to the entire distribution. +v1.0.5 December 1997 + Updated descu so that the "Last Updated" line in the describe + source "header" is updated to reflect the current date and + time (GMT, if supported). + v1.0.4 September 1997 This package is now part of the base GNO distribution. Version numbers are now in lockstep. @@ -140,17 +145,20 @@ AUTHORS The original describe and descc utilities and the describe format were written by James Brookes . -The descu utility and v1.01 as well as 1.0.4 modifications to the describe -package were by Devin Reade . +The descu utility was written by Devin Reade. -v1.02/1.03 modifications to the describe package were by Soenke Behrens -. +The following people have performed updates as listed: + v1.0.5 Devin Reade + v1.0.4 Devin Reade + v1.03 Soenke Behrens + v1.02 Soenke Behrens + v1.01 Devin Reade LEGALESE ======== -The describe and descc utilities are copyright (c) 1994-1995 by James -Brookes. The descu utility is copyright (c) 1995 by Devin Reade. +The describe and descc utilities are copyright (c) 1994-1997 by James +Brookes. The descu utility is copyright (c) 1995-1997 by Devin Reade. These programs may be freely copied provided that the archive, including source files and this README, remain intact. Modified versions of these @@ -162,5 +170,5 @@ any commercial software collections. Permission is granted to Usenet sites and GEnie Information Services for inclusion in software archives. The Apple IIGS executable files distributed with this archive contain -material from the ORCA/C Run-Time Libraries, copyright 1987-1995 by +material from the ORCA/C Run-Time Libraries, copyright 1987-1997 by Byte Works, Inc. Used with permission. diff --git a/usr.orca.bin/describe/desc.h b/usr.orca.bin/describe/desc.h index 90f652a..d9f7395 100644 --- a/usr.orca.bin/describe/desc.h +++ b/usr.orca.bin/describe/desc.h @@ -2,11 +2,11 @@ * Header file for the describe package. This file is * used by describe(1), descc(8), and descu(8). * - * $Id: desc.h,v 1.4 1997/09/26 05:56:54 gdr Exp $ + * $Id: desc.h,v 1.5 1997/12/22 00:34:52 gdr Exp $ */ /* Keep these utilities in lockstep. */ -#define _VERSION_ "v1.0.4" +#define _VERSION_ "v1.0.5" #define QUOTE_CHAR '#' #define DATABASE "/usr/lib/describe.db" diff --git a/usr.orca.bin/describe/descc.desc b/usr.orca.bin/describe/descc.desc index 98957be..676f56a 100644 --- a/usr.orca.bin/describe/descc.desc +++ b/usr.orca.bin/describe/descc.desc @@ -1,5 +1,5 @@ Name: descc -Version: 1.0.4 +Version: 1.0.5 Shell: ORCA/Shell, GNO/ME Author: James Brookes Contact: jamesb@ecst.csuchico.edu diff --git a/usr.orca.bin/describe/describe.desc b/usr.orca.bin/describe/describe.desc index 3fc9b31..7099266 100644 --- a/usr.orca.bin/describe/describe.desc +++ b/usr.orca.bin/describe/describe.desc @@ -1,5 +1,5 @@ Name: describe -Version: 1.0.4 +Version: 1.0.5 Shell: ORCA/Shell, GNO/ME Author: James Brookes Contact: jamesb@ecst.csuchico.edu diff --git a/usr.orca.bin/describe/descu.8 b/usr.orca.bin/describe/descu.8 index 23175a2..d12f37e 100644 --- a/usr.orca.bin/describe/descu.8 +++ b/usr.orca.bin/describe/descu.8 @@ -1,5 +1,5 @@ .\" -.\" $Id: descu.8,v 1.4 1997/09/24 06:34:58 gdr Exp $ +.\" $Id: descu.8,v 1.5 1997/12/22 00:34:52 gdr Exp $ .\" .TH DESCU 8 "22 September 1997" GNO "System Administration" .SH NAME @@ -66,7 +66,7 @@ Show usage information. Send output to .IR outfile rather than stdout. -.IP \fB-v\fR +.IP \fB-V\fR Show version information. .SH AUTHOR Devin Reade diff --git a/usr.orca.bin/describe/descu.c b/usr.orca.bin/describe/descu.c index 6902f9e..92ed649 100644 --- a/usr.orca.bin/describe/descu.c +++ b/usr.orca.bin/describe/descu.c @@ -11,7 +11,7 @@ * Copyright 1995-1997 by Devin Reade for James Brookes' describe(1) utility. * See the included README file and man page for details. * - * $Id: descu.c,v 1.5 1997/10/30 04:19:10 gdr Exp $ + * $Id: descu.c,v 1.6 1997/12/22 00:34:52 gdr Exp $ */ #include @@ -24,6 +24,7 @@ #include #include #include +#include #ifdef __GNO__ #include #endif @@ -461,11 +462,14 @@ void usage(char *progName) { */ int main(int argc, char **argv) { + static char *revisionMagic = "\n# Last revision:"; + time_t t; char *buffer; int i, j; FILE *outfp, *rejfp, *temp = NULL; int c; char *outputfile=NULL; + char *p; int compare; #ifdef __STACK_CHECK__ @@ -550,7 +554,22 @@ int main(int argc, char **argv) { /* print the header, if it exists */ if (header != NULL) { - fprintf(outfp,"%s\n",header); + if ((p = strstr(header, revisionMagic)) != NULL) { + /* found the "Last revision" line? Update it */ + *p = '\0'; + p += strlen(revisionMagic); + while (*p && *p != '\n') { + p++; + } + if (*p) { + p++; + } + time(&t); + fprintf(outfp,"%s%s %s%s", header, revisionMagic, + asctime(gmtime(&t)), p); + } else { + fprintf(outfp,"%s\n", header); + } } /* first stage; merge while we have two arrays */ diff --git a/usr.orca.bin/describe/descu.desc b/usr.orca.bin/describe/descu.desc index 2cb0291..cf87cd2 100644 --- a/usr.orca.bin/describe/descu.desc +++ b/usr.orca.bin/describe/descu.desc @@ -1,5 +1,5 @@ Name: descu -Version: 1.0.4 +Version: 1.0.5 Shell: ORCA/Shell, GNO/ME Author: Devin Reade Contact: gdr@myrias.ab.ca