From ed782560cf5048cad828e708f50ad11f2d845339 Mon Sep 17 00:00:00 2001 From: gdr Date: Mon, 13 Feb 1995 19:47:38 +0000 Subject: [PATCH] Soenke's final v1.14 release. Deleted __CCFRONT__ kludge for Splat!. Fixed typo in man page and corrected case of ORCA and GNO. Added /* End Of File */ where necessary. --- usr.orca.bin/udl/Makefile.gs | 8 +++++--- usr.orca.bin/udl/README | 8 ++++---- usr.orca.bin/udl/common.c | 7 ++----- usr.orca.bin/udl/common.h | 4 +++- usr.orca.bin/udl/globals.c | 6 ++---- usr.orca.bin/udl/udl.1 | 4 ++-- usr.orca.bin/udl/udlgs.c | 5 +---- usr.orca.bin/udl/udlunix.c | 7 +++---- usr.orca.bin/udl/udluse.c | 5 +---- 9 files changed, 23 insertions(+), 31 deletions(-) diff --git a/usr.orca.bin/udl/Makefile.gs b/usr.orca.bin/udl/Makefile.gs index 484c226..159dda0 100644 --- a/usr.orca.bin/udl/Makefile.gs +++ b/usr.orca.bin/udl/Makefile.gs @@ -3,7 +3,7 @@ # Copyright (c) 1993-1994 Soenke Behrens # For use with dmake # -# $Id: Makefile.gs,v 1.6 1995/02/08 06:12:27 gdr Exp $ +# $Id: Makefile.gs,v 1.7 1995/02/13 19:47:23 gdr Exp $ # # Define the following as necessary: # @@ -29,8 +29,10 @@ DEFINES = -DGNO -D_POSIX_C_SOURCE -D_POSIX_SOURCE -DHAS_ATEXIT \ -DOVERFLOW_CHECK -CFLAGS = $(DEFINES) -O -w -v -s2048 -LDFLAGS = -v -l/usr/lib/gnulib -s2048 +#CFLAGS = $(DEFINES) -O -w -v -s2048 +#LDFLAGS = -v -l/usr/lib/gnulib -s2048 +CFLAGS = $(DEFINES) -O -v -s2048 +LDFLAGS = -v -s2048 # # You should not have to modify anything beyond this point diff --git a/usr.orca.bin/udl/README b/usr.orca.bin/udl/README index c92b0e2..cc51ed2 100644 --- a/usr.orca.bin/udl/README +++ b/usr.orca.bin/udl/README @@ -4,7 +4,7 @@ udl - Convert EOL formats freely between MS-DOS (CR/LF), Unix/Amiga (LF), (c) 1993-1995 Soenke Behrens, Devin Reade - Version 1.14: $Id: README,v 1.6 1995/02/08 06:12:31 gdr Exp $ + Version 1.14: $Id: README,v 1.7 1995/02/13 19:47:25 gdr Exp $ ============================================================================= Udl converts text files between CR, LF and CR/LF (Apple, Unix and MS-DOS). @@ -76,11 +76,11 @@ Compiling: ========= There are two makefiles included: - Makefile.gs - for use on the Apple IIgs running Gno + Makefile.gs - for use on the Apple IIgs running GNO Makefile.unix - for use with Unix systems. -Although udl on the IIgs can be run from either Gno or Orca shells, -it cannot be built with the standard Orca installation due to a lack +Although udl on the IIgs can be run from either GNO or ORCA shells, +it cannot be built with the standard ORCA installation due to a lack of additional libraries. Before you type "make", have a look at the Makefile and edit the defines diff --git a/usr.orca.bin/udl/common.c b/usr.orca.bin/udl/common.c index af223c6..fd4bc01 100644 --- a/usr.orca.bin/udl/common.c +++ b/usr.orca.bin/udl/common.c @@ -1,13 +1,10 @@ -#ifdef __CCFRONT__ -#line 2 -#endif /* * udl - Convert EOL formats freely between MS-DOS (CR/LF), Unix/Amiga (LF), * and Apple (CR). * * Routines common to both the Unix and Apple IIgs versions. * - * $Id: common.c,v 1.6 1995/02/08 06:12:33 gdr Exp $ + * $Id: common.c,v 1.7 1995/02/13 19:47:27 gdr Exp $ * * Copyright (c) 1993-1995 Soenke Behrens, Devin Reade */ @@ -853,7 +850,7 @@ char *mktemp(const char *base) } } - /* Replace all "X" with part if ID string */ + /* Replace all "X" with part of ID string */ for(p1 = st + strlen(st) - 1,p2 = &id[14]; p1 >= st && p2 >= id && *p1 == 'X'; p1--,p2--) diff --git a/usr.orca.bin/udl/common.h b/usr.orca.bin/udl/common.h index 824b9b7..789d80b 100644 --- a/usr.orca.bin/udl/common.h +++ b/usr.orca.bin/udl/common.h @@ -4,7 +4,7 @@ * * Header file for routines common to both the Unix and Apple IIgs versions. * - * $Id: common.h,v 1.6 1995/02/08 06:12:36 gdr Exp $ + * $Id: common.h,v 1.7 1995/02/13 19:47:29 gdr Exp $ * * Copyright (c) 1993-1995 Soenke Behrens, Devin Reade */ @@ -96,3 +96,5 @@ extern char *getwd(char *); #ifdef __GNUC__ extern char getopt(int, char **, char *); #endif + +/* End Of File */ diff --git a/usr.orca.bin/udl/globals.c b/usr.orca.bin/udl/globals.c index 8e764e4..c0c21e6 100644 --- a/usr.orca.bin/udl/globals.c +++ b/usr.orca.bin/udl/globals.c @@ -1,13 +1,10 @@ -#ifdef __CCFRONT__ -#line 2 -#endif /* * udl - Convert EOL formats freely between MS-DOS (CR/LF), Unix/Amiga (LF), * and Apple (CR). * * Contains definitions of global variables declared in common.h * - * $Id: globals.c,v 1.3 1995/02/08 06:12:38 gdr Exp $ + * $Id: globals.c,v 1.5 1996/01/22 01:01:34 gdr Exp $ * * Copyright (c) 1993-1995 Soenke Behrens, Devin Reade */ @@ -36,3 +33,4 @@ char **pathList; /* the list of files to process, given relative */ char dirbrk; /* the character used to separate parts of a path name */ int recursionDepth; /* levels of subdirectories that we've traversed */ +/* End Of File */ diff --git a/usr.orca.bin/udl/udl.1 b/usr.orca.bin/udl/udl.1 index d1d4e28..e3e0ac0 100644 --- a/usr.orca.bin/udl/udl.1 +++ b/usr.orca.bin/udl/udl.1 @@ -1,5 +1,5 @@ .\" Copyright (c) 1993-1995 Soenke Behrens, Devin Reade -.\" $Id: udl.1,v 1.6 1995/02/08 06:12:40 gdr Exp $ +.\" $Id: udl.1,v 1.7 1995/02/13 19:47:33 gdr Exp $ .\" .TH UDL 1 "Commands and Applications" "7 February 1995" "Version 1.14" .SH NAME @@ -41,7 +41,7 @@ flag is used. .PP During file conversion .B udl -creates a temporary file in the same directory as the orginal file. +creates a temporary file in the same directory as the original file. The temporary file is close to or exactly the same size as the original file. .PP diff --git a/usr.orca.bin/udl/udlgs.c b/usr.orca.bin/udl/udlgs.c index dc5f0ac..5064d74 100644 --- a/usr.orca.bin/udl/udlgs.c +++ b/usr.orca.bin/udl/udlgs.c @@ -1,13 +1,10 @@ -#ifdef __CCFRONT__ -#line 2 -#endif /* * udl - Convert EOL formats freely between MS-DOS (CR/LF), Unix/Amiga (LF), * and Apple (CR). * * Apple IIgs specific routines. * - * $Id: udlgs.c,v 1.6 1995/02/08 06:12:44 gdr Exp $ + * $Id: udlgs.c,v 1.7 1995/02/13 19:47:34 gdr Exp $ * * Copyright (c) 1993-1995 Soenke Behrens, Devin Reade */ diff --git a/usr.orca.bin/udl/udlunix.c b/usr.orca.bin/udl/udlunix.c index be91315..b15ffc1 100644 --- a/usr.orca.bin/udl/udlunix.c +++ b/usr.orca.bin/udl/udlunix.c @@ -1,13 +1,10 @@ -#ifdef __CCFRONT__ -#line 2 -#endif /* * udl - Convert EOL formats freely between MS-DOS (CR/LF), Unix/Amiga (LF), * and Apple (CR). * * Unix specific routines. * - * $Id: udlunix.c,v 1.6 1995/02/08 06:12:47 gdr Exp $ + * $Id: udlunix.c,v 1.7 1995/02/13 19:47:36 gdr Exp $ * * Copyright (c) 1993-1995 Soenke Behrens, Devin Reade */ @@ -212,3 +209,5 @@ int main(int argc,char *argv[]) { return (EXIT_SUCCESS); } + +/* End Of File */ diff --git a/usr.orca.bin/udl/udluse.c b/usr.orca.bin/udl/udluse.c index c011269..bc7d140 100644 --- a/usr.orca.bin/udl/udluse.c +++ b/usr.orca.bin/udl/udluse.c @@ -1,13 +1,10 @@ -#ifdef __CCFRONT__ -#line 2 -#endif /* * udl - Convert EOL formats freely between MS-DOS (CR/LF), Unix/Amiga (LF), * and Apple (CR). * * Usage strings. * - * $Id: udluse.c,v 1.6 1995/02/08 06:12:49 gdr Exp $ + * $Id: udluse.c,v 1.7 1995/02/13 19:47:38 gdr Exp $ * * Copyright (c) 1993-1995 Soenke Behrens, Devin Reade */