files from last release. ex-050325

This commit is contained in:
2024-10-10 18:04:47 +00:00
parent 0793775912
commit 2c0c217bb6
58 changed files with 7236 additions and 430 deletions

View File

@@ -83,7 +83,7 @@ char *copyright =
"@(#) Copyright (c) 1980 Regents of the University of California.\n\
All rights reserved.\n";
#endif
static char sccsid[] UNUSED = "@(#)exrecover.c 1.23 (gritter) 12/25/06";
static char sccsid[] UNUSED = "@(#)exrecover.c 1.21 (gritter) 11/27/04";
#endif
/* from exrecover.c 7.9.2 (2.11BSD) 1996/10/26 */
@@ -210,8 +210,6 @@ main(int argc, char *argv[])
#ifdef VMUNIX
poolsbrk(0);
#endif
linebuf = calloc(LBSIZE = BUFSIZ<4096?4096:BUFSIZ, sizeof *linebuf);
genbuf = calloc(MAXBSIZE, sizeof *genbuf);
#ifdef LANGMSG
setlocale(LC_MESSAGES, "");
catd = catopen(CATNAME, NL_CAT_LOCALE);
@@ -428,7 +426,7 @@ listfiles(char *dirname)
xfprintf(xstderr, catgets(catd, 2, 6, "No files saved.\n"));
return;
}
qsort(&svbuf[0], ecount, sizeof svbuf[0], (int(*)(const void *, const void *)) qucmp);
qsort(&svbuf[0], ecount, sizeof svbuf[0], (int(*)()) qucmp);
for (fp = &svbuf[0]; fp < &svbuf[ecount]; fp++) {
cp = ctime(&fp->sf_time);
cp[10] = 0;
@@ -449,7 +447,7 @@ enter(struct svfile *fp, char *fname, int count)
{
register char *cp, *cp2;
register struct svfile *f, *fl;
time_t curtime;
time_t curtime, itol();
f = 0;
if (count >= NENTRY) {
@@ -841,15 +839,14 @@ getblock(line atl, int iof)
return (obuff + off);
if (iof == READ) {
if (ichanged)
blkio(iblock, ibuff,
(ssize_t(*)(int, void *, size_t))write);
blkio(iblock, ibuff, (ssize_t(*)())write);
ichanged = 0;
iblock = bno;
blkio(bno, ibuff, (ssize_t(*)(int, void *, size_t))read);
blkio(bno, ibuff, (ssize_t(*)())read);
return (ibuff + off);
}
if (oblock >= 0)
blkio(oblock, obuff, (ssize_t(*)(int, void *, size_t))write);
blkio(oblock, obuff, (ssize_t(*)())write);
oblock = bno;
return (obuff + off);
}