jik@athena.mit.edu (Jonathan I. Kamens) (05/14/89)
In article <608@ispi.UUCP> jbayer@ispi.UUCP (Jonathan Bayer) writes: >I was going through my sources and realized that I was missing the first >patch for the Athena delete software package which was posted in >comp.sources.unix recently. I have patch # 2. Could someone please >mail me patch # 1? This is probably my fault, because rather than post an "official" patch #1, I let the patch that someone else posted serve as the patch. Therefore, just in case some people did not apply those patches because they were not an "official" patches, below is the Official Patch #1 for the delete package. It doesn't modify PATCHLEVEL, since you should already be up to patchlevel 2 :-) Jonathan Kamens USnail: MIT Project Athena 410 Memorial Drive, No. 223F jik@Athena.MIT.EDU Cambridge, MA 02139-4318 Office: 617-253-4261 Home: 617-225-8218 ************************* #! /bin/sh # This is a shell archive. Remove anything before this line, then unpack # it by saving it into a file and typing "sh file". To overwrite existing # files, type "sh file -c". You can also feed this as standard input via # unshar, or by typing "sh <file", e.g.. If this archive is complete, you # will see the following message at the end: # "End of shell archive." # Contents: delete.patch # Wrapped by jik@pit-manager on Sun May 14 00:51:47 1989 PATH=/bin:/usr/bin:/usr/ucb ; export PATH if test -f 'delete.patch' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'delete.patch'\" else echo shar: Extracting \"'delete.patch'\" \(3171 characters\) sed "s/^X//" >'delete.patch' <<'END_OF_FILE' X*** col.c.orig Sun May 14 00:44:29 1989 X--- col.c Sun May 14 00:44:29 1989 X*************** X*** 11,17 **** X */ X X #if (!defined(lint) && !defined(SABER)) X! static char rcsid_col_c[] = "$Header: col.c,v 1.2 89/03/27 12:05:12 jik Exp $"; X #endif X X /* X--- 11,17 ---- X */ X X #if (!defined(lint) && !defined(SABER)) X! static char rcsid_col_c[] = "$Header: col.c,v 1.3 89/05/04 09:09:27 jik Exp $"; X #endif X X /* X*************** X*** 64,81 **** X height++; X X if (number_flag) for (updown = 0; updown < height; updown++) { X! for (leftright = updown; leftright < num_to_print; X! leftright += height) { X (void) sprintf(buf, "%*d. %s", numwidth, leftright+1, X strings[leftright]); X! fprintf(outfile, "%*s", -column_width, buf); X } X fprintf(outfile, "\n"); X } else for (updown = 0; updown < height; updown++) { X! for (leftright = updown; leftright < num_to_print; X! leftright += height) { X (void) sprintf(buf, "%s", strings[leftright]); X! fprintf(outfile, "%*s", -column_width, buf); X } X fprintf(outfile, "\n"); X } X--- 64,85 ---- X height++; X X if (number_flag) for (updown = 0; updown < height; updown++) { X! for (leftright = updown; leftright < num_to_print; ) { X (void) sprintf(buf, "%*d. %s", numwidth, leftright+1, X strings[leftright]); X! if ((leftright += height) >= num_to_print) X! fprintf(outfile, "%s", buf ); X! else X! fprintf(outfile, "%*s", -column_width, buf); X } X fprintf(outfile, "\n"); X } else for (updown = 0; updown < height; updown++) { X! for (leftright = updown; leftright < num_to_print; ) { X (void) sprintf(buf, "%s", strings[leftright]); X! if ((leftright += height) >= num_to_print) X! fprintf(outfile, "%s", buf ); X! else X! fprintf(outfile, "%*s", -column_width, buf); X } X fprintf(outfile, "\n"); X } X*** expunge.c.orig Sun May 14 00:44:44 1989 X--- expunge.c Sun May 14 00:44:45 1989 X*************** X*** 11,17 **** X */ X X #if (!defined(lint) && !defined(SABER)) X! static char rcsid_expunge_c[] = "$Header: expunge.c,v 1.7 89/03/27 12:06:47 jik Exp $"; X #endif X X /* X--- 11,17 ---- X */ X X #if (!defined(lint) && !defined(SABER)) X! static char rcsid_expunge_c[] = "$Header: expunge.c,v 1.8 89/04/06 23:25:20 jik Exp $"; X #endif X X /* X*************** X*** 270,276 **** X char **files; X int num; X { X! int i; X filerec *leaf; X X for (i = 0; i < num; i++) { X--- 270,276 ---- X char **files; X int num; X { X! int i, skipped = 0; X filerec *leaf; X X for (i = 0; i < num; i++) { X*************** X*** 283,293 **** X free(files[i]); X if (! timed_out(leaf, current_time, timev)) { X free_leaf(leaf); X! num--; X } X } X free(files); X! return(num); X } X X X--- 283,293 ---- X free(files[i]); X if (! timed_out(leaf, current_time, timev)) { X free_leaf(leaf); X! skipped++; X } X } X free(files); X! return(num-skipped); X } X X END_OF_FILE if test 3171 -ne `wc -c <'delete.patch'`; then echo shar: \"'delete.patch'\" unpacked with wrong size! fi # end of 'delete.patch' fi echo shar: End of shell archive. exit 0