WebSVN – tendra.SVN – Diff – /branches/tendra5/src/tools/tcc/archive.c

+/*
+ * Copyright (c) 2002-2005 The TenDRA Project <http://www.tendra.org/>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of The TenDRA Project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific, prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
+ * IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $Id$
+ */
 /*
     		 Crown Copyright (c) 1997
     This TenDRA(r) Computer Program is subject to Copyright
     owned by the United Kingdom Secretary of State for Defence
     acting through the Defence Evaluation and Research Agency
     (DERA).  It is made available to Recipients with a
     royalty-free licence for its use, reproduction, transfer
     to other parties and amendment for any purpose not excluding
     product development provided that any such use et cetera
     shall be deemed to be acceptance of the following conditions:-
         (1) Its Recipients shall ensure that this Notice is
         reproduced upon any copies or amended versions of it;
         (2) Any amended version of it shall be clearly marked to
         show both the nature of and the organisation responsible
         for the relevant amendment or amendments;
         (3) Its onward transfer from a recipient to another
         party shall be deemed to be that party's acceptance of
         these conditions;
         (4) DERA gives no warranty or assurance as to its
         quality or suitability for any purpose and DERA accepts
         no liability whatsoever in relation to any use to which
         it may be put.
 */
 #include "list.h"
 #include "archive.h"
 #include "flags.h"
 #include "options.h"
 #include "utility.h"
+	}
-    }
-    IGNORE fclose ( g ) ;
-    return ( 0 ) ;
-}
-/*
-    CAT A FILE
-    This routine copies the file named nm to the standard output.  It
-    returns a nonzero value if an error occurs.
-*/
-int cat_file
-    PROTO_N ( ( nm ) )
-    PROTO_T ( char *nm )
-{
-    return ( write_file ( nm, "r", stdout ) ) ;
-}
-/*
-    CREATE A DIRECTORY
-    This routine creates a directory called nm, returning zero if it
-    is successful.  Two alternative versions of the routine are provided.
-    The first is POSIX compliant and uses mkdir and various mode
-    constants from sys/stat.h.  The second raises an error - in this
-    case the mkdir function should be implemented by an external call.
-*/
-int make_dir
-    PROTO_N ( ( nm ) )
-    PROTO_T ( char *nm )
-{
-    if ( dry_run ) return ( 0 ) ;
-#if FS_STAT
-    {
-	mode_t m = ( mode_t ) ( S_IRWXU | S_IRWXG | S_IRWXO ) ;
-	int e = mkdir ( nm, m ) ;
-	return ( e ) ;
-    }
-#else
-    {
-	error ( INTERNAL, "Built-in mkdir function not implemented" ) ;
-	return ( 1 ) ;
-    }
-#endif
-}
-/*
-    MOVE A FILE
-    This routine moves the file named from to the file named to,
-    returning zero if it is successful.  Normally the files will be
-    on different filesystems, so we can't always use rename.
-*/
-int move_file
-    PROTO_N ( ( from, to ) )
-    PROTO_T ( char *from X char *to )
-{
-    int e ;
-    FILE *f ;
-    if ( dry_run ) return ( 0 ) ;
-    if ( streq ( from, to ) ) return ( 0 ) ;
-#if FS_STAT
-    if ( rename ( from, to ) == 0 ) return ( 0 ) ;
-    if ( errno != EXDEV ) {
-	error ( SERIOUS, "Can't rename '%s' to '%s'", from, to ) ;
-	return ( 1 ) ;
-    }
-#endif
-    f = fopen ( to, "wb" ) ;
-    if ( f == null ) {
-	error ( SERIOUS, "Can't open copy destination file, '%s'", to ) ;
-	return ( 1 ) ;
-    }
-    e = write_file ( from, "rb", f ) ;
-    IGNORE fclose ( f ) ;
-    if ( e ) return ( e ) ;
-    if ( remove ( from ) ) {
-	error ( SERIOUS, "Can't remove source file, '%s'", from ) ;
-	return ( 1 ) ;
-    }
-    return ( 0 ) ;
-}
-/*
-    REMOVE A FILE
-    This routine removes the file or directory named nm, returning zero
-    if it is successful.  Two alternative versions of the routine are
-    provided.  The first is POSIX compliant and uses stuff from
-    sys/stat.h and dirent.h.  The second raises an error - in this case
-    the remove function should be implemented by an external call.
-*/
-int remove_file
-    PROTO_N ( ( nm ) )
-    PROTO_T ( char *nm )
-{
-    if ( dry_run ) return ( 0 ) ;
 #if FS_DIRENT
-    {
+	{
-	struct stat st ;
+		struct stat st;
-	int e = stat ( nm, &st ) ;
+		int e = stat(nm, &st);
-	if ( e != -1 ) {
+		if (e != -1) {
-	    mode_t m = ( mode_t ) st.st_mode ;
+			mode_t m = (mode_t)st.st_mode;
-	    if ( S_ISDIR ( m ) ) {
+			if (S_ISDIR(m)) {
-		DIR *d = opendir ( nm ) ;
+				DIR *d = opendir(nm);
-		if ( d == null ) {
+				if (d == null) {
+					e = 1;
+				} else {
+					char *p;
+					struct dirent *t;
+					char buff [1000];
+					IGNORE sprintf(buff, "%s/", nm);
+					p = buff + strlen(buff);
+					while (t = readdir(d), t != null) {
+						char *dnm = t->d_name;
+						if (!streq(dnm, ".") &&
+						    !streq(dnm, "..")) {
+							IGNORE strcpy(p, dnm);
+							if (remove_file(buff)) {
+								e = 1;
+							}
+						}
+					}
+					IGNORE closedir(d);
+					if (rmdir(nm)) {
-		    e = 1 ;
+						e = 1;
+					}
+				}
+			} else {
+				e = remove(nm);
+			}
 		} else {
-		    char *p ;
-		    struct dirent *t ;
-		    char buff [1000] ;
-		    IGNORE sprintf ( buff, "%s/", nm ) ;
-		    p = buff + strlen ( buff ) ;
-		    while ( t = readdir ( d ), t != null ) {
+			/* If the file didn't exist, don't worry */
-			char *dnm = t->d_name ;
+			if (errno == ENOENT) {
-			if ( !streq ( dnm, "." ) && !streq ( dnm, ".." ) ) {
-			    IGNORE strcpy ( p, dnm ) ;
+				return (0);
-			    if ( remove_file ( buff ) ) e = 1 ;
+			}
-		    }
-		    IGNORE closedir ( d ) ;
-		    if ( rmdir ( nm ) ) e = 1 ;
+		}
-	    } else {
+		if (e) {
+			error(SERIOUS, "Can't remove '%s'", nm);
-		e = remove ( nm ) ;
+			return (1);
-	    }
+		}
-	} else {
+		return (0);
-	    /* If the file didn't exist, don't worry */
-	    if ( errno == ENOENT ) return ( 0 ) ;
 	}
-	if ( e ) {
+#else
+	{
-	    error ( SERIOUS, "Can't remove '%s'", nm ) ;
+		error(INTERNAL, "Built-in remove function not implemented");
-	    return ( 1 ) ;
+		return (1);
+	}
-	return ( 0 ) ;
-    }
-#else
-    {
-	error ( INTERNAL, "Built-in remove function not implemented" ) ;
-	return ( 1 ) ;
-    }
 #endif
 }
 /*
-    TOUCH A FILE
+ * TOUCH A FILE
+ *
-    This routine touches the file called nm.  It returns 0 if it is
+ * This routine touches the file called nm. It returns 0 if it is successful.
-    successful.
-*/
+ */
-int touch_file
+int
-    PROTO_N ( ( nm, opt ) )
-    PROTO_T ( char *nm X char *opt )
+touch_file(char *nm, char *opt)
+{
-    if ( !dry_run ) {
+	if (!dry_run) {
-	FILE *f = fopen ( nm, "w" ) ;
+		FILE *f = fopen(nm, "w");
+		if (f == null) {
-	if ( f == null ) error ( SERIOUS, "Can't touch file, '%s'", nm ) ;
+			error(SERIOUS, "Can't touch file, '%s'", nm);
+		}
-	if ( opt && streq ( opt, "-k" ) ) {
+		if (opt && streq(opt, "-k")) {
-	    /* This is an empty C spec file */
+			/* This is an empty C spec file */
-	    static unsigned char cs [] = {
+			static unsigned char cs [] = {
 x80
-	    } ;
+			};
-	    size_t s1 = sizeof ( cs [0] ) ;
+			size_t s1 = sizeof(cs [0]);
-	    size_t sn = ( size_t ) ( sizeof ( cs ) / s1 ) ;
+			size_t sn = (size_t)(sizeof(cs) / s1);
-	    IGNORE fwrite ( ( pointer ) cs, s1, sn, f ) ;
+			IGNORE fwrite((pointer)cs, s1, sn, f);
-	} else {
+		} else {
-	    IGNORE fputs ( "EMPTY\n", f ) ;
+			IGNORE fputs("EMPTY\n", f);
+		}
+		IGNORE fclose(f);
+	}
-	IGNORE fclose ( f ) ;
-    }
-    return ( 0 ) ;
+	return (0);
+}
 /*
-    POOR MAN'S TEMPNAM FUNCTION
+ * POOR MAN'S TEMPNAM FUNCTION
+ *
-    The token temporary_name can be defined to be either tempnam (which
+ * The token temporary_name can be defined to be either tempnam (which is in
-    is in XPG3 but not POSIX) or this routine, which is designed to serve
+ * XPG3 but not POSIX) or this routine, which is designed to serve a similar
-    a similar purpose.  The routine uses tmpnam (which is in ANSI) to
+ * purpose. The routine uses tmpnam (which is in ANSI) to create a temporary
-    create a temporary file name, and appends the suffix pfx to this name.
+ * file name, and appends the suffix pfx to this name. The dir argument is not
-    The dir argument is not used.
+ * used.
-*/
+ */
 #if !FS_TEMPNAM
-char *like_tempnam
+char *
-    PROTO_N ( ( dir, pfx ) )
-    PROTO_T ( char *dir X char *pfx ) /* ARGSUSED */
+like_tempnam(char *dir, char *pfx) /* ARGSUSED */
 {
-    static char letter = 'a' ;
+	static char letter = 'a';
-    char *p = buffer ;
+	char *p = buffer;
-    UNUSED ( dir ) ;
+	UNUSED(dir);
-    IGNORE tmpnam ( p ) ;
+	IGNORE tmpnam(p);
-    p += strlen ( p ) ;
+	p += strlen(p);
-    p [0] = letter ;
+	p [0] = letter;
-    p [1] = '.' ;
+	p [1] = '.';
-    IGNORE strcpy ( p + 2, pfx ) ;
+	IGNORE strcpy(p + 2, pfx);
-    letter = ( char ) ( letter + 1 ) ;
+	letter = (char)(letter + 1);
-    return ( string_copy ( buffer ) ) ;
+	return (string_copy(buffer));
 }
-#endif
-/*
-    FIND THE SIZE OF A FILE
-    This routine calculates the length of a file, returning zero for
-    non-existant files.  Two versions of the routine are provided.
-    The first is POSIX compliant and uses stat from sys/stat.h to
-    access the length directly.  The second just reads the file and
-    counts the number of characters.
-*/
-long file_size
-    PROTO_N ( ( nm ) )
-    PROTO_T ( char *nm )
-{
-#if FS_STAT
-    {
-	struct stat st ;
-	int e = stat ( nm, &st ) ;
-	if ( e == -1 ) return ( 0 ) ;
-	return ( ( long ) st.st_size ) ;
-    }
-#else
-    {
-	size_t n = 0, m ;
-	pointer p = ( pointer ) buffer ;
-	FILE *f = fopen ( nm, "rb" ) ;
-	if ( f == null ) return ( 0 ) ;
-	while ( m = fread ( p, sizeof ( char ), block_size, f ), m != 0 ) {
-	    n = ( size_t ) ( n + m ) ;
-	}
-	IGNORE fclose ( f ) ;
-	return ( ( long ) n ) ;
-    }
 #endif
-}
 /*
-    FIND THE DATE STAMP OF A FILE
+ * FIND THE SIZE OF A FILE
+ *
-    This routine calculates the date stamp of a file.  If the target
+ * This routine calculates the length of a file, returning zero for
-    machine does not support stat, or this is a dry run, zero is always
+ * non-existant files. Two versions of the routine are provided. The first is
+ * POSIX compliant and uses stat from sys/stat.h to access the length directly.
-    returned.
+ * The second just reads the file and counts the number of characters.
-*/
+ */
-static long file_time
+long
-    PROTO_N ( ( nm ) )
-    PROTO_T ( char *nm )
+file_size(char *nm)
+{
 #if FS_STAT
-    {
+	{
-	int e ;
-	struct stat st ;
+		struct stat st;
-	if ( dry_run ) return ( 0 ) ;
-	e = stat ( nm, &st ) ;
+		int e = stat(nm, &st);
-	if ( e == -1 ) {
+		if (e == -1) {
-	    error ( SERIOUS, "Can't access file '%s'", nm ) ;
-	    return ( 0 ) ;
+			return (0);
+		}
+		return ((long)st.st_size);
+	}
-	return ( ( long ) st.st_mtime ) ;
-    }
 #else
-    {
+	{
+		size_t n = 0, m;
+		pointer p = (pointer)buffer;
+		FILE *f = fopen(nm, "rb");
-	UNUSED ( nm ) ;
+		if (f == null) {
-	return ( 0 ) ;
+			return (0);
-    }
+		}
+		while (m = fread(p, sizeof(char), block_size, f), m != 0) {
+			n = (size_t)(n + m);
+		}
+		IGNORE fclose(f);
+		return ((long)n);
+	}
 #endif
+}
 /*
+ * FIND THE DATE STAMP OF A FILE
+ *
+ * This routine calculates the date stamp of a file. If the target machine
+ * does not support stat, or this is a dry run, zero is always returned.
+ */
+static long
+file_time(char *nm)
+{
+#if FS_STAT
+	{
+		int e;
+		struct stat st;
+		if (dry_run) {
+			return (0);
+		}
-    ARCHIVE HEADER
+		e = stat(nm, &st);
+		if (e == -1) {
+			error(SERIOUS, "Can't access file '%s'", nm);
+			return (0);
+		}
+		return ((long)st.st_mtime);
+	}
+#else
+	{
+		UNUSED(nm);
+		return (0);
+	}
+#endif
+}
+/*
+ * ARCHIVE HEADER
+ *
-    A TDF archive always starts with ARCHIVE_HEADER, and the main part
+ * A TDF archive always starts with ARCHIVE_HEADER, and the main part of the
-    of the archive ends with ARCHIVE_TRAILER.
+ * archive ends with ARCHIVE_TRAILER.
-*/
+ */
 #define ARCHIVE_HEADER		"!TDF\n"
 #define ARCHIVE_TRAILER		"-\n"
 /*
-    IS A FILE AN ARCHIVE?
+ * IS A FILE AN ARCHIVE?
+ *
+ * This routine returns 1 if the file named nm starts with ARCHIVE_HEADER (and
+ * so is probably an archive), and 0 otherwise.
+ */
-    This routine returns 1 if the file named nm starts with ARCHIVE_HEADER
-    (and so is probably an archive), and 0 otherwise.
-*/
-boolean is_archive
+boolean
-    PROTO_N ( ( nm ) )
-    PROTO_T ( char *nm )
+is_archive(char *nm)
-{
-    boolean b = 0 ;
-    FILE *f = fopen ( nm, "rb" ) ;
-    if ( f == null ) return ( b ) ;
-    if ( fgets ( buffer, 20, f ) && streq ( buffer, ARCHIVE_HEADER ) ) {
-	b = 1 ;
-    }
-    IGNORE fclose ( f ) ;
-    return ( b ) ;
-}
-/*
-    ARCHIVE FLAGS
-    These flags control the output of the file names and options in the
-    output TDF archive.
-*/
-int archive_type = TDF_ARCHIVE ;
-static boolean archive_full = 1 ;
-static boolean archive_links = 0 ;
-static boolean archive_names = 1 ;
-static boolean archive_options = 1 ;
-/*
-    PROCESS ARCHIVE OPTIONS
-    This routine processes any outstanding archive options.
-*/
-void process_archive_opt
-    PROTO_Z ()
+{
-    list *p ;
+	boolean b = 0;
-    for ( p = opt_joiner ; p != null ; p = p->next ) {
-	char *opt = p->item ;
+	FILE *f = fopen(nm, "rb");
-	if ( streq ( opt, "-copy" ) || streq ( opt, "-c" ) ) {
-	    archive_links = 0 ;
-	    link_specs = 0 ;
-	} else if ( streq ( opt, "-full" ) || streq ( opt, "-f" ) ) {
-	    archive_full = 1 ;
-	} else if ( streq ( opt, "-link" ) || streq ( opt, "-l" ) ) {
-	    archive_links = 1 ;
-	    link_specs = 1 ;
-	} else if ( streq ( opt, "-names" ) || streq ( opt, "-n" ) ) {
-	    archive_names = 1 ;
-	} else if ( streq ( opt, "-no_names" ) || streq ( opt, "-nn" ) ) {
-	    archive_names = 0 ;
-	} else if ( streq ( opt, "-no_options" ) || streq ( opt, "-no" ) ) {
-	    archive_options = 0 ;
-	} else if ( streq ( opt, "-options" ) || streq ( opt, "-o" ) ) {
-	    archive_options = 1 ;
-	} else if ( streq ( opt, "-short" ) || streq ( opt, "-s" ) ) {
-	    archive_full = 0 ;
+	if (f == null) {
-	} else {
+		return (b);
-	    error ( WARNING, "Unknown archiver option, '%s'", opt ) ;
+	}
+	if (fgets(buffer, 20, f) && streq(buffer, ARCHIVE_HEADER)) {
-    }
+		b = 1;
+	}
-    opt_joiner = null ;
+	IGNORE fclose(f);
-    return ;
+	return (b);
+}
 /*
+ * ARCHIVE FLAGS
+ *
+ * These flags control the output of the file names and options in the output
+ * TDF archive.
+ */
-    BUILD AN ARCHIVE
+int archive_type = TDF_ARCHIVE;
+static boolean archive_full = 1;
+static boolean archive_links = 0;
+static boolean archive_names = 1;
+static boolean archive_options = 1;
-    This routine creates a TDF archive called arch from the null-terminated
-    list of files and options, input.  The string ARCHIVE_OPTION_START is
-    uses to indicate the end of the files and the beginning of the options.
-    The routine returns zero if it is successful.
-*/
+/*
-int build_archive
+ * PROCESS ARCHIVE OPTIONS
+ *
-    PROTO_N ( ( arch, input ) )
+ * This routine processes any outstanding archive options.
+ */
+void
-    PROTO_T ( char *arch X char **input )
+process_archive_opt(void)
+{
+	list *p;
+	for (p = opt_joiner; p != null; p = p->next) {
+		char *opt = p->item;
+		if (streq(opt, "-copy") || streq(opt, "-c")) {
+			archive_links = 0;
+			link_specs = 0;
+		} else if (streq(opt, "-full") || streq(opt, "-f")) {
+			archive_full = 1;
+		} else if (streq(opt, "-link") || streq(opt, "-l")) {
+			archive_links = 1;
+			link_specs = 1;
+		} else if (streq(opt, "-names") || streq(opt, "-n")) {
+			archive_names = 1;
+		} else if (streq(opt, "-no_names") || streq(opt, "-nn")) {
+			archive_names = 0;
+		} else if (streq(opt, "-no_options") || streq(opt, "-no")) {
+			archive_options = 0;
+		} else if (streq(opt, "-options") || streq(opt, "-o")) {
+			archive_options = 1;
+		} else if (streq(opt, "-short") || streq(opt, "-s")) {
+			archive_full = 0;
+		} else {
+			error(WARNING, "Unknown archiver option, '%s'", opt);
+		}
+	}
+	opt_joiner = null;
+	return;
+}
+/*
+ * BUILD AN ARCHIVE
+ *
+ * This routine creates a TDF archive called arch from the null-terminated list
+ * of files and options, input. The string ARCHIVE_OPTION_START is uses to
+ * indicate the end of the files and the beginning of the options. The routine
+ * returns zero if it is successful.
+ */
+int
+build_archive(char *arch, char **input)
+{
-    FILE *f ;
+    FILE *f;
-    char **s ;
+    char **s;
-    boolean end = 0 ;
+    boolean end = 0;
-    if ( dry_run ) return ( 0 ) ;
+    if (dry_run) {
+	    return (0);
+    }
-    f = fopen ( arch, "wb" ) ;
+    f = fopen(arch, "wb");
-    if ( f == null ) {
+    if (f == null) {
-	error ( SERIOUS, "Can't open output archive, '%s'", arch ) ;
+	error(SERIOUS, "Can't open output archive, '%s'", arch);
-	return ( 1 ) ;
+	return (1);
+    }
-    IGNORE fputs ( ARCHIVE_HEADER, f ) ;
+    IGNORE fputs(ARCHIVE_HEADER, f);
-    for ( s = input ; *s ; s++ ) {
+    for (s = input; *s; s++) {
-	if ( end ) {
+	if (end) {
 	    /* Archive options */
-	    if ( archive_options ) {
+	    if (archive_options) {
-		if ( verbose ) {
+		if (verbose) {
-		    comment ( 1, "... archive option %s\n", *s ) ;
+		    comment(1, "... archive option %s\n", *s);
+		}
-		IGNORE fprintf ( f, "%s\n", *s ) ;
+		IGNORE fprintf(f, "%s\n", *s);
+	    }
-	} else if ( streq ( *s, ARCHIVE_OPTION_START ) ) {
+	} else if (streq(*s, ARCHIVE_OPTION_START)) {
 	    /* Start of archive options */
-	    IGNORE fputs ( ARCHIVE_TRAILER, f ) ;
+	    IGNORE fputs(ARCHIVE_TRAILER, f);
-	    end = 1 ;
+	    end = 1;
-	} else if ( archive_links && archive_type != TDF_ARCHIVE ) {
+	} else if (archive_links && archive_type != TDF_ARCHIVE) {
 	    /* Archive file - link */
-	    char *ln = *s ;
+	    char *ln = *s;
-	    if ( verbose ) {
+	    if (verbose) {
-		comment ( 1, "... archive file %s (link)\n", ln ) ;
+		comment(1, "... archive file %s (link)\n", ln);
 	    }
+	    if (archive_full) {
-	    if ( archive_full ) ln = find_fullname ( ln ) ;
+		    ln = find_fullname(ln);
+	    }
-	    IGNORE fprintf ( f, "> %ld %s\n", file_time ( ln ), ln ) ;
+	    IGNORE fprintf(f, "> %ld %s\n", file_time(ln), ln);
 	} else {
 	    /* Archive file - copy */
-	    FILE *g ;
+	    FILE *g;
-	    char *n = find_basename ( *s ) ;
+	    char *n = find_basename(*s);
-	    if ( !archive_names ) {
+	    if (!archive_names) {
-		int i, m = ( int ) strlen ( n ) ;
+		int i, m = (int)strlen(n);
-		buffer [0] = '*' ;
+		buffer [0] = '*';
-		buffer [1] = 0 ;
+		buffer [1] = 0;
-		for ( i = m - 1 ; i >= 0 ; i-- ) {
+		for (i = m - 1; i >= 0; i--) {
-		    if ( n [i] == '.' ) {
+		    if (n [i] == '.') {
-			IGNORE strcpy ( buffer + 1, n + i ) ;
+			IGNORE strcpy(buffer + 1, n + i);
-			break ;
+			break;
+		    }
+		}
-		n = buffer ;
+		n = buffer;
+	    }
+	    if (verbose) {
-	    if ( verbose ) comment ( 1, "... archive file %s\n", *s ) ;
+		    comment(1, "... archive file %s\n", *s);
+	    }
-	    g = fopen ( *s, "rb" ) ;
+	    g = fopen(*s, "rb");
-	    if ( g == null ) {
+	    if (g == null) {
-		error ( SERIOUS, "Can't open '%s' for archiving", *s ) ;
+		error(SERIOUS, "Can't open '%s' for archiving", *s);
-		IGNORE fclose ( f ) ;
+		IGNORE fclose(f);
-		return ( 1 ) ;
+		return (1);
 	    } else {
-		pointer p = ( pointer ) buffer ;
+		pointer p = (pointer)buffer;
-		size_t m = fread ( p, sizeof ( char ), ( size_t ) block_size, g ) ;
+		size_t m = fread(p, sizeof(char), (size_t)block_size, g);
-		IGNORE fprintf ( f, "+ %ld %s\n", ( long ) m, n ) ;
+		IGNORE fprintf(f, "+ %ld %s\n",(long)m, n);
-		while ( m ) {
+		while (m) {
-		    if ( fwrite ( p, sizeof ( char ), m, f ) != m ) {
+		    if (fwrite(p, sizeof(char), m, f)!= m) {
-			error ( SERIOUS, "Write error in archive '%s'", arch ) ;
+			error(SERIOUS, "Write error in archive '%s'", arch);
-			IGNORE fclose ( f ) ;
+			IGNORE fclose(f);
-			return ( 1 ) ;
+			return (1);
+		    }
-		    m = fread ( p, sizeof ( char ), ( size_t ) block_size, g ) ;
+		    m = fread(p, sizeof(char), (size_t)block_size, g);
+		    if (m) {
-		    if ( m ) IGNORE fprintf ( f, "+ %ld +\n", ( long ) m ) ;
+			    IGNORE fprintf(f, "+ %ld +\n", (long)m);
+		    }
 		}
-		IGNORE fclose ( g ) ;
+		IGNORE fclose(g);
 	    }
 	}
+    }
+    if (!end) {
+	    IGNORE fputs(ARCHIVE_TRAILER, f);
+    }
-    if ( !end ) IGNORE fputs ( ARCHIVE_TRAILER, f ) ;
-    IGNORE fclose ( f ) ;
+    IGNORE fclose(f);
-    return ( 0 ) ;
+    return (0);
+}
 /*
-    SPLIT AN ARCHIVE
+ * SPLIT AN ARCHIVE
+ *
-    This routine splits the TDF archive named arch into it consistuent
+ * This routine splits the TDF archive named arch into it consistuent
-    components.  Any files from the archive are stored in the location
+ * components. Any files from the archive are stored in the location indicated
-    indicated by ret.  The routine returns zero if it is successful.
+ * by ret. The routine returns zero if it is successful.
-*/
+ */
-int split_archive
+int
-    PROTO_N ( ( arch, ret ) )
-    PROTO_T ( char *arch X filename **ret )
+split_archive(char *arch, filename **ret)
+{
-    boolean go = 1 ;
+    boolean go = 1;
-    char *emsg = null ;
+    char *emsg = null;
-    list *opts = null ;
+    list *opts = null;
-    filename *q = null ;
+    filename *q = null;
-    filename *output = null ;
+    filename *output = null;
-    boolean need_moves = 0 ;
+    boolean need_moves = 0;
     /* Open archive file */
-    FILE *f = fopen ( arch, "rb" ) ;
+    FILE *f = fopen(arch, "rb");
-    if ( f == null ) {
+    if (f == null) {
-	emsg = "Can't open input archive, '%s'" ;
+	emsg = "Can't open input archive, '%s'";
-	goto archive_error ;
+	goto archive_error;
     }
     /* Check for archive header */
-    if ( fgets ( buffer, buffer_size, f ) == null ||
+    if (fgets(buffer, buffer_size, f) == null ||
-	 !streq ( buffer, ARCHIVE_HEADER ) ) {
+	 !streq(buffer, ARCHIVE_HEADER)) {
-	emsg = "Illegal input archive, '%s'" ;
+	emsg = "Illegal input archive, '%s'";
-	goto archive_error ;
+	goto archive_error;
+    }
     /* Extract archived files */
     do {
-	if ( fgets ( buffer, buffer_size, f ) == null ) {
+	if (fgets(buffer, buffer_size, f) == null) {
-	    emsg = "Premature end of archive '%s'" ;
+	    emsg = "Premature end of archive '%s'";
-	    goto archive_error ;
+	    goto archive_error;
+	}
-	if ( buffer [0] == '+' && buffer [1] == ' ' ) {
+	if (buffer [0] == '+' && buffer [1] == ' ') {
 	    /* Archived file - copy */
-	    char c ;
+	    char c;
-	    long n = 0 ;
+	    long n = 0;
-	    char *w = "wb" ;
+	    char *w = "wb";
-	    char *p = buffer + 2 ;
+	    char *p = buffer + 2;
-	    int m = ( int ) strlen ( buffer ) - 1 ;
+	    int m = (int)strlen(buffer) - 1;
-	    if ( buffer [m] == '\n' ) buffer [m] = 0 ;
+	    if (buffer [m] == '\n') {
+		    buffer [m] = 0;
+	    }
-	    while ( c = *( p++ ), c != ' ' ) {
+	    while (c = *(p++), c != ' ') {
-		if ( c < '0' || c > '9' ) {
+		if (c < '0' || c > '9') {
-		    emsg = "Illegal file length specifier in archive '%s'" ;
+		    emsg = "Illegal file length specifier in archive '%s'";
-		    goto archive_error ;
+		    goto archive_error;
 		}
-		n = 10 * n + ( c - '0' ) ;
+		n = 10 * n + (c - '0');
 	    }
-	    if ( streq ( p, "+" ) ) {
+	    if (streq(p, "+")) {
 		/* File continuations */
-		if ( q == null ) {
+		if (q == null) {
-		    emsg = "Illegal file continuation in archive '%s'" ;
+		    emsg = "Illegal file continuation in archive '%s'";
-		    goto archive_error ;
+		    goto archive_error;
 		}
-		w = "ab" ;
+		w = "ab";
 	    } else {
-		filename *qo = q ;
+		filename *qo = q;
-		if ( streq ( p, "*" ) ) {
+		if (streq(p, "*")) {
 		    /* Old form hidden names */
-		    int k = where ( INDEP_TDF ) ;
+		    int k = where(INDEP_TDF);
-		    q = make_filename ( no_filename, INDEP_TDF, k ) ;
+		    q = make_filename(no_filename, INDEP_TDF, k);
-		} else if ( strneq ( p, "*.", 2 ) ) {
+		} else if (strneq(p, "*.", 2)) {
 		    /* New form hidden names */
-		    int t ;
+		    int t;
-		    p = string_copy ( p ) ;
+		    p = string_copy(p);
-		    q = find_filename ( p, UNKNOWN_TYPE ) ;
+		    q = find_filename(p, UNKNOWN_TYPE);
-		    t = q->type ;
+		    t = q->type;
-		    q = make_filename ( no_filename, t, where ( t ) ) ;
+		    q = make_filename(no_filename, t, where(t));
 		} else {
 		    /* Unhidden names */
-		    p = string_copy ( p ) ;
+		    p = string_copy(p);
-		    q = find_filename ( p, UNKNOWN_TYPE ) ;
+		    q = find_filename(p, UNKNOWN_TYPE);
-		    q = make_filename ( q, q->type, where ( q->type ) ) ;
+		    q = make_filename(q, q->type, where(q->type));
 		}
-		if ( archive_type != TDF_ARCHIVE && qo ) q->uniq = qo->uniq ;
+		if (archive_type != TDF_ARCHIVE && qo) {
+			q->uniq = qo->uniq;
+		}
-		if ( q->type == archive_type && q->storage != TEMP_FILE ) {
+		if (q->type == archive_type && q->storage != TEMP_FILE) {
-		    filename *qn = make_filename ( q, q->type, TEMP_FILE ) ;
+		    filename *qn = make_filename(q, q->type, TEMP_FILE);
-		    qn->aux = q ;
+		    qn->aux = q;
-		    qn->uniq = q->uniq ;
+		    qn->uniq = q->uniq;
-		    q = qn ;
+		    q = qn;
-		    need_moves = 1 ;
+		    need_moves = 1;
 		}
-		output = add_filename ( output, q ) ;
+		output = add_filename(output, q);
-		if ( verbose ) {
+		if (verbose) {
-		    comment ( 1, "... extract file %s\n", q->name ) ;
+		    comment(1, "... extract file %s\n", q->name);
 		}
 	    }
-	    if ( read_file ( q->name, w, n, f ) ) {
+	    if (read_file(q->name, w, n, f)) {
-		emsg = "Read error in archive '%s'" ;
+		emsg = "Read error in archive '%s'";
-		goto archive_error ;
+		goto archive_error;
 	    }
-	} else if ( buffer [0] == '>' && buffer [1] == ' ' ) {
+	} else if (buffer [0] == '>' && buffer [1] == ' ') {
 	    /* Archived file - link */
-	    char c ;
+	    char c;
-	    long ad = 0, fd ;
+	    long ad = 0, fd;
-	    filename *qo = q ;
+	    filename *qo = q;
-	    char *p = buffer + 2 ;
+	    char *p = buffer + 2;
-	    int m = ( int ) strlen ( buffer ) - 1 ;
+	    int m = (int)strlen(buffer) - 1;
-	    if ( buffer [m] == '\n' ) buffer [m] = 0 ;
+	    if (buffer [m] == '\n') {
+		    buffer [m] = 0;
+	    }
-	    while ( c = *( p++ ), c != ' ' ) {
+	    while (c = *(p++), c != ' ') {
-		if ( c < '0' || c > '9' ) {
+		if (c < '0' || c > '9') {
-		    emsg = "Illegal link information in archive '%s'" ;
+		    emsg = "Illegal link information in archive '%s'";
-		    goto archive_error ;
+		    goto archive_error;
 		}
-		ad = 10 * ad + ( c - '0' ) ;
+		ad = 10 * ad + (c - '0');
+	    }
+	    q = find_filename(string_copy(p), UNKNOWN_TYPE);
+	    q->storage = PRESERVED_FILE;
+	    if (archive_type != TDF_ARCHIVE && qo) {
+		    q->uniq = qo->uniq;
+	    }
-	    q = find_filename ( string_copy ( p ), UNKNOWN_TYPE ) ;
-	    q->storage = PRESERVED_FILE ;
-	    if ( archive_type != TDF_ARCHIVE && qo ) q->uniq = qo->uniq ;
-	    output = add_filename ( output, q ) ;
+	    output = add_filename(output, q);
-	    if ( verbose ) {
+	    if (verbose) {
-		comment ( 1, "... extract file %s (link)\n", q->name ) ;
+		comment(1, "... extract file %s (link)\n", q->name);
+	    }
-	    fd = file_time ( q->name ) ;
+	    fd = file_time(q->name);
-	    if ( ad && fd && ad != fd ) {
+	    if (ad && fd && ad != fd) {
-		error ( WARNING, "Date stamp on file '%s' has changed",
+		error(WARNING, "Date stamp on file '%s' has changed",
-			q->name ) ;
+			q->name);
+	    }
-	} else if ( streq ( buffer, ARCHIVE_TRAILER ) ) {
+	} else if (streq(buffer, ARCHIVE_TRAILER)) {
 	    /* Archived options */
-	    char *p ;
+	    char *p;
-	    int c, m ;
+	    int c, m;
-	    while ( c = getc ( f ), c != EOF ) {
+	    while (c = getc(f), c != EOF) {
-		buffer [0] = ( char ) c ;
+		buffer [0] = (char)c;
-		if ( fgets ( buffer + 1, buffer_size - 1, f ) == null ) {
+		if (fgets(buffer + 1, buffer_size - 1, f) == null) {
-		    emsg = "Premature end of archive '%s'" ;
+		    emsg = "Premature end of archive '%s'";
-		    goto archive_error ;
+		    goto archive_error;
+		}
-		m = ( int ) strlen ( buffer ) - 1 ;
+		m = (int)strlen(buffer) - 1;
-		if ( buffer [m] == '\n' ) buffer [m] = 0 ;
+		if (buffer [m] == '\n') {
+			buffer [m] = 0;
+		}
-		p = string_copy ( buffer ) ;
+		p = string_copy(buffer);
+		if (verbose) {
-		if ( verbose ) comment ( 1, "... extract option %s\n", p ) ;
+			comment(1, "... extract option %s\n", p);
+		}
-		opts = add_item ( opts, p ) ;
+		opts = add_item(opts, p);
+	    }
-	    go = 0 ;
+	    go = 0;
 	} else {
-	    emsg = "Illegal file description in archive '%s'" ;
+	    emsg = "Illegal file description in archive '%s'";
-	    goto archive_error ;
+	    goto archive_error;
+	}
-    } while ( go ) ;
+    } while (go);
     /* Return */
-    archive_error : {
+archive_error:
+    if (emsg) {
-	if ( emsg ) error ( SERIOUS, emsg, arch ) ;
+	    error(SERIOUS, emsg, arch);
+    }
-	IGNORE fclose ( f ) ;
+    IGNORE fclose(f);
-	if ( need_moves ) {
+    if (need_moves) {
-	    for ( q = output ; q != null ; q = q->next ) {
+	    for (q = output; q != null; q = q->next) {
-		if ( q->aux && keeps_aux [ archive_type ] ) {
+		    if (q->aux && keeps_aux [ archive_type ]) {
-		    if ( verbose ) {
+			    if (verbose) {
-			comment ( 1, "... rename %s to %s\n", q->name,
+				    comment(1, "... rename %s to %s\n",
-				  q->aux->name ) ;
+					    q->name, q->aux->name);
-		    }
+			    }
-		    if ( move_file ( q->name, q->aux->name ) ) {
+			    if (move_file(q->name, q->aux->name)) {
-			emsg = "rhubarb" ;
+				    emsg = "rhubarb";
-		    } else {
+			    } else {
-			q->name = q->aux->name ;
+				    q->name = q->aux->name;
-			q->storage = q->aux->storage ;
+				    q->storage = q->aux->storage;
+			    }
+		    }
-		}
-		q->aux = null ;
+		    q->aux = null;
+	    }
-	}
-	*ret = output ;
-	if ( opts ) {
-	    process_options ( opts, main_optmap ) ;
-	    opt_archive = add_list ( opt_archive, opts ) ;
-	}
-	if ( emsg ) return ( 1 ) ;
-	return ( 0 ) ;
+    }
+    *ret = output;
+    if (opts) {
+	    process_options(opts, main_optmap, 0);
+	    opt_archive = add_list(opt_archive, opts);
+    }
+    if (emsg) {
+	    return (1);
+    }
+    return (0);
+}

Subversion Repositories tendra.SVN

(root)/branches/tendra5/src/tools/tcc/archive.c – Rev 5 → 6