There used to be a limit of 65k on the size of the describe

database source when using descu.  This limit was imposed
	due to a bug in ORCA/C (it is no longer clear whether
	this was a bug in malloc(3) or in array indexing code).
	As of ORCA/C v2.1.x, this bug appears to be fixed, so
	the limit was lifted.
A couple of calls to lseek(2) didn't have their return values
	checked for errors.  Fixed.
Updated email address for Devin Reade.
This commit is contained in:
gdr-ftp 1998-02-07 06:40:11 +00:00
parent 8a732d9bc6
commit 17aad04201
12 changed files with 51 additions and 43 deletions

View File

@ -1,7 +1,7 @@
$Id: README,v 1.7 1998/01/17 07:20:06 gdr Exp $ $Id: README,v 1.8 1998/02/07 06:39:53 gdr-ftp Exp $
This is the README file for the describe package. This package is This is the README file for the describe package. This package is
designated as version 1.0.5, and consists of the following utilities: designated as version 1.0.6, and consists of the following utilities:
describe - show database entries describing the current describe - show database entries describing the current
status of programs status of programs
@ -64,7 +64,7 @@ and descu.8. I briefly pondered having a describe.5, but alas I was too
lazy; you can find the file formats as part of descc.8. lazy; you can find the file formats as part of descc.8.
Devin Reade Devin Reade
gdr@myrias.ab.ca gdr@trenco.gno.org
INSTALLATION INSTALLATION
============ ============
@ -131,6 +131,17 @@ CHANGES
This details changes to the entire distribution. This details changes to the entire distribution.
v1.0.6 February 1998
There used to be a limit of 65k on the size of the describe
database source when using descu. This limit was imposed
due to a bug in ORCA/C (it is no longer clear whether
this was a bug in malloc(3) or in array indexing code).
As of ORCA/C v2.1.x, this bug appears to be fixed, so
the limit was lifted.
A couple of calls to lseek(2) didn't have their return values
checked for errors. Fixed.
Updated email address for Devin Reade.
v1.0.5 January 1998 v1.0.5 January 1998
Increased the number of characters in the name field of the Increased the number of characters in the name field of the
nameEntry struct from 34 to 36. This gives an 8-byte nameEntry struct from 34 to 36. This gives an 8-byte
@ -203,7 +214,8 @@ written by James Brookes <jamesb@ecst.csuchico.edu>.
The descu utility was written by Devin Reade. The descu utility was written by Devin Reade.
The following people have performed updates as listed: The following people have performed updates as listed:
v1.0.5 Devin Reade <gdr@myrias.com> v1.0.6 Devin Reade <gdr@trenco.gno.org>
v1.0.5 Devin Reade
v1.0.4 Devin Reade v1.0.4 Devin Reade
v1.03 Soenke Behrens <sbehrens@bigfoot.com> v1.03 Soenke Behrens <sbehrens@bigfoot.com>
v1.02 Soenke Behrens v1.02 Soenke Behrens

View File

@ -2,14 +2,14 @@
* Header file for the describe package. This file is * Header file for the describe package. This file is
* used by describe(1), descc(8), and descu(8). * used by describe(1), descc(8), and descu(8).
* *
* $Id: desc.h,v 1.6 1998/01/17 07:20:06 gdr Exp $ * $Id: desc.h,v 1.7 1998/02/07 06:39:55 gdr-ftp Exp $
*/ */
/* /*
* Keep these utilities in lockstep. Don't forget to change the version * Keep these utilities in lockstep. Don't forget to change the version
* number in the *.rez files and in the manual pages. * number in the *.rez files and in the manual pages.
*/ */
#define _VERSION_ "v1.0.5" #define _VERSION_ "v1.0.6"
#define QUOTE_CHAR '#' #define QUOTE_CHAR '#'
#define DATABASE "/usr/lib/describe.db" #define DATABASE "/usr/lib/describe.db"

View File

@ -1,7 +1,7 @@
.\" .\"
.\" $Id: descc.8,v 1.6 1998/01/17 07:20:07 gdr Exp $ .\" $Id: descc.8,v 1.7 1998/02/07 06:39:57 gdr-ftp Exp $
.\" .\"
.TH DESCC 8 "22 September 1997" GNO "System Administration" .TH DESCC 8 "6 February 1998" GNO "System Administration"
.SH NAME .SH NAME
descc \- the describe(1) source compiler descc \- the describe(1) source compiler
.SH SYNOPSIS .SH SYNOPSIS
@ -13,7 +13,7 @@ descc \- the describe(1) source compiler
.SH DESCRIPTION .SH DESCRIPTION
This manual page documents This manual page documents
.BR descc .BR descc
version 1.0.5. version 1.0.6.
.LP .LP
.BR descc .BR descc
compiles the describe source file compiles the describe source file
@ -55,7 +55,7 @@ a complete record:
.nf .nf
Name: describe Name: describe
Version: 1.0.5 Version: 1.0.6
Shell: GNO, ORCA/Shell Shell: GNO, ORCA/Shell
Author: James Brookes Author: James Brookes
Contact: jamesb@ecst.csuchico.edu Contact: jamesb@ecst.csuchico.edu

View File

@ -1,9 +1,9 @@
Name: descc Name: descc
Version: 1.0.5 Version: 1.0.6
Shell: ORCA/Shell, GNO/ME Shell: ORCA/Shell, GNO/ME
Author: James Brookes Author: James Brookes
Contact: jamesb@ecst.csuchico.edu Contact: jamesb@ecst.csuchico.edu
Where: /usr/sbin Where: /usr/sbin
FTP: apple2.caltech.edu, ground.isca.uiowa.edu, trenco.myrias.com FTP: ftp.gno.org
Compile a source file into a 'describe' database file. Compile a source file into a 'describe' database file.

View File

@ -1,7 +1,7 @@
/* /*
* Resources for version and comment * Resources for version and comment
* *
* $Id: descc.rez,v 1.2 1998/01/17 07:20:07 gdr Exp $ * $Id: descc.rez,v 1.3 1998/02/07 06:39:59 gdr-ftp Exp $
*/ */
#include "Types.rez" #include "Types.rez"
@ -14,7 +14,7 @@
* Version * Version
*/ */
resource rVersion (1, purgeable3) { resource rVersion (1, purgeable3) {
{ 1, 0, 5, /* Version 1.0.5 */ { 1, 0, 6, /* Version */
release, /* development|alpha|beta|final|release */ release, /* development|alpha|beta|final|release */
0 }, /* non-final release number */ 0 }, /* non-final release number */
verUS, /* Country */ verUS, /* Country */
@ -26,7 +26,7 @@ resource rVersion (1, purgeable3) {
* Comment * Comment
*/ */
resource rComment (1, purgeable3) { resource rComment (1, purgeable3) {
PROG " v1.0.4\n" PROG " v1.0.6\n"
DESC " (GNO) \n" DESC " (GNO) \n"
AUTHOR AUTHOR
}; };

View File

@ -1,7 +1,7 @@
.\" .\"
.\" $Id: describe.1,v 1.6 1998/01/17 07:20:07 gdr Exp $ .\" $Id: describe.1,v 1.7 1998/02/07 06:40:00 gdr-ftp Exp $
.\" .\"
.TH DESCRIBE 1 "22 September 1997" GNO "Commands and Applications" .TH DESCRIBE 1 "6 February 1998" GNO "Commands and Applications"
.SH NAME .SH NAME
describe \- show information about a program describe \- show information about a program
.SH SYNOPSIS .SH SYNOPSIS
@ -13,7 +13,7 @@ describe \- show information about a program
.SH DESCRIPTION .SH DESCRIPTION
This manual page documents This manual page documents
.BR describe .BR describe
version 1.0.5. version 1.0.6.
.LP .LP
.BR describe .BR describe
will show current information about will show current information about

View File

@ -1,10 +1,10 @@
Name: describe Name: describe
Version: 1.0.5 Version: 1.0.6
Shell: ORCA/Shell, GNO/ME Shell: ORCA/Shell, GNO/ME
Author: James Brookes Author: James Brookes
Contact: jamesb@ecst.csuchico.edu Contact: jamesb@ecst.csuchico.edu
Where: /usr/bin Where: /usr/bin
FTP: apple2.caltech.edu, ground.isca.uiowa.edu, trenco.myrias.com FTP: ftp.gno.org
Print a multi-line description obtained from the compiled 'describe' Print a multi-line description obtained from the compiled 'describe'
database; giving utility name, version, intended shell, author, author's database; giving utility name, version, intended shell, author, author's

View File

@ -1,7 +1,7 @@
/* /*
* Resources for version and comment * Resources for version and comment
* *
* $Id: describe.rez,v 1.2 1998/01/17 07:20:07 gdr Exp $ * $Id: describe.rez,v 1.3 1998/02/07 06:40:05 gdr-ftp Exp $
*/ */
#include "Types.rez" #include "Types.rez"
@ -14,7 +14,7 @@
* Version * Version
*/ */
resource rVersion (1, purgeable3) { resource rVersion (1, purgeable3) {
{ 1, 0, 5, /* Version 1.0.5 */ { 1, 0, 6, /* Version */
release, /* development|alpha|beta|final|release */ release, /* development|alpha|beta|final|release */
0 }, /* non-final release number */ 0 }, /* non-final release number */
verUS, /* Country */ verUS, /* Country */
@ -26,7 +26,7 @@ resource rVersion (1, purgeable3) {
* Comment * Comment
*/ */
resource rComment (1, purgeable3) { resource rComment (1, purgeable3) {
PROG " v1.0.5\n" PROG " v1.0.6\n"
DESC " (GNO) \n" DESC " (GNO) \n"
AUTHOR AUTHOR
}; };

View File

@ -1,7 +1,7 @@
.\" .\"
.\" $Id: descu.8,v 1.6 1998/01/17 07:20:07 gdr Exp $ .\" $Id: descu.8,v 1.7 1998/02/07 06:40:07 gdr-ftp Exp $
.\" .\"
.TH DESCU 8 "22 September 1997" GNO "System Administration" .TH DESCU 8 "6 February 1998" GNO "System Administration"
.SH NAME .SH NAME
descu \- the describe(1) source updater descu \- the describe(1) source updater
.SH SYNOPSIS .SH SYNOPSIS
@ -20,7 +20,7 @@ descu \- the describe(1) source updater
.SH DESCRIPTION .SH DESCRIPTION
This manual page documents This manual page documents
.BR descu .BR descu
version 1.0.5. version 1.0.6.
.LP .LP
.BR descu .BR descu
updates the describe source file updates the describe source file
@ -69,7 +69,7 @@ rather than stdout.
.IP \fB-V\fR .IP \fB-V\fR
Show version information. Show version information.
.SH AUTHOR .SH AUTHOR
Devin Reade <gdr@myrias.ab.ca> Devin Reade <gdr@trenco.gno.org>
.SH HISTORY .SH HISTORY
.BR descu .BR descu
was incorporated into the GNO base distribution as of version 1.0.4 was incorporated into the GNO base distribution as of version 1.0.4

View File

@ -11,7 +11,7 @@
* Copyright 1995-1997 by Devin Reade for James Brookes' describe(1) utility. * Copyright 1995-1997 by Devin Reade for James Brookes' describe(1) utility.
* See the included README file and man page for details. * See the included README file and man page for details.
* *
* $Id: descu.c,v 1.7 1998/01/17 07:20:07 gdr Exp $ * $Id: descu.c,v 1.8 1998/02/07 06:40:08 gdr-ftp Exp $
*/ */
#include <sys/types.h> #include <sys/types.h>
@ -30,7 +30,6 @@
#endif #endif
#include "desc.h" #include "desc.h"
#define MAX_BUFFER 65534
#define SLOTS_QUANTUM 64 #define SLOTS_QUANTUM 64
#define REJECT_FILE "descu.rej" #define REJECT_FILE "descu.rej"
@ -84,13 +83,10 @@ inhale (char *pathname) {
/* create the buffer */ /* create the buffer */
bytecount = lseek(fd,(off_t) 0,SEEK_END); bytecount = lseek(fd,(off_t) 0,SEEK_END);
if (bytecount > MAX_BUFFER) { if ((bytecount == -1) || (lseek(fd,(off_t) 0, SEEK_SET) == -1)) {
fprintf(stderr,"descu internal error: cannot handle files greater " perror("lseek failed");
"than %d bytes\n due to a compiler bug. Sorry.\n", exit(1);
MAX_BUFFER);
exit(-1);
} }
lseek(fd,(off_t) 0, SEEK_SET);
if ((buffer = malloc(bytecount+1))==NULL) { if ((buffer = malloc(bytecount+1))==NULL) {
fprintf(stderr,"error: malloc of %ld-byte buffer failed for file %s:%s\n", fprintf(stderr,"error: malloc of %ld-byte buffer failed for file %s:%s\n",
bytecount+1,pathname,strerror(errno)); bytecount+1,pathname,strerror(errno));

View File

@ -1,9 +1,9 @@
Name: descu Name: descu
Version: 1.0.5 Version: 1.0.6
Shell: ORCA/Shell, GNO/ME Shell: ORCA/Shell, GNO/ME
Author: Devin Reade Author: Devin Reade
Contact: gdr@myrias.ab.ca Contact: gdr@trenco.gno.org
Where: /usr/sbin Where: /usr/sbin
FTP: apple2.caltech.edu, ground.isca.uiowa.edu, trenco.myrias.com FTP: ftp.gno.org
Update a 'describe' source file. Update a 'describe' source file.

View File

@ -1,20 +1,20 @@
/* /*
* Resources for version and comment * Resources for version and comment
* *
* $Id: descu.rez,v 1.2 1998/01/17 07:20:07 gdr Exp $ * $Id: descu.rez,v 1.3 1998/02/07 06:40:11 gdr-ftp Exp $
*/ */
#include "Types.rez" #include "Types.rez"
/* Don't forget to update the version numbers, below (two places) */ /* Don't forget to update the version numbers, below (two places) */
#define PROG "descu" #define PROG "descu"
#define DESC "describe(1) source updater" #define DESC "describe(1) source update utility"
#define AUTHOR "Author: Devin Reade <gdr@myrias.com>" #define AUTHOR "Author: Devin Reade <gdr@trenco.gno.org>"
/* /*
* Version * Version
*/ */
resource rVersion (1, purgeable3) { resource rVersion (1, purgeable3) {
{ 1, 0, 5, /* Version 1.0.5 */ { 1, 0, 6, /* Version */
release, /* development|alpha|beta|final|release */ release, /* development|alpha|beta|final|release */
0 }, /* non-final release number */ 0 }, /* non-final release number */
verUS, /* Country */ verUS, /* Country */
@ -26,7 +26,7 @@ resource rVersion (1, purgeable3) {
* Comment * Comment
*/ */
resource rComment (1, purgeable3) { resource rComment (1, purgeable3) {
PROG " v1.0.5\n" PROG " v1.0.6\n"
DESC " (GNO) \n" DESC " (GNO) \n"
AUTHOR AUTHOR
}; };