Check for struct tm.tm_gmtoff instead of defining NO_STRUCT_TM_GMTOFF on

[netatalk.git] / bin / megatron / macbin.c

diff --git a/bin/megatron/macbin.c b/bin/megatron/macbin.c
index a83c73e618ba1f081a50b7065dec6b81339006e8..b98ef75720e658fd6d4a819b06c7c32560da3266 100644 (file)
--- a/bin/megatron/macbin.c
+++ b/bin/megatron/macbin.c
@@ -1,15 +1,23 @@
+/*
+ * $Id: macbin.c,v 1.11 2003-12-15 05:27:24 srittau Exp $
+ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+#endif /* HAVE_CONFIG_H */
 
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <sys/time.h>
 #include <sys/param.h>
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif /* HAVE_FCNTL_H */
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif /* HAVE_UNISTD_H */
+#include <string.h>
 #include <strings.h>
-#include <syslog.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <time.h>
@@ -17,6 +25,7 @@
 #include <atalk/adouble.h>
 #include <netatalk/endian.h>
 #include "megatron.h"
+#include "macbin.h"
 
 /* This allows megatron to generate .bin files that won't choke other
    well-known converter apps. It also makes sure that checksums
@@ -28,7 +37,7 @@
  */
 #ifndef        STDIN
 #      define  STDIN   "-"
-#endif
+#endif /* STDIN */
 
 /*     Yes and no
  */
@@ -39,8 +48,6 @@
  */
 #define HEADBUFSIZ     128
 
-u_short                updcrc();
-
 /*     Both input and output routines use this struct and the
        following globals; therefore this module can only be used
        for one of the two functions at a time.
@@ -62,7 +69,7 @@ u_char                head_buf[HEADBUFSIZ];
  * somewhat initialized; bin_filed is set.
  */
 
-bin_open( binfile, flags, fh, options )
+int bin_open( binfile, flags, fh, options )
     char               *binfile;
     int                        flags, options;
     struct FHeader     *fh;
@@ -74,15 +81,16 @@ bin_open( binfile, flags, fh, options )
 
 #if DEBUG
     fprintf( stderr, "entering bin_open\n" );
-#endif
+#endif /* DEBUG */
 
     /* call localtime so that we get the timezone offset */
     bin.gmtoff = 0;
-#ifndef NO_STRUCT_TM_GMTOFF
+#ifdef HAVE_STRUCT_TM_TM_GMTOFF
     time(&t);
-    if (tp = localtime(&t))
+    tp = localtime(&t);
+    if (tp)
         bin.gmtoff = tp->tm_gmtoff;
-#endif
+#endif /* HAVE_STRUCT_TM_TM_GMTOFF */
 
     if ( flags == O_RDONLY ) { /* input */
        if ( strcmp( binfile, STDIN ) == 0 ) {
@@ -93,7 +101,7 @@ bin_open( binfile, flags, fh, options )
        }
 #if DEBUG
        fprintf( stderr, "opened %s for read\n", binfile );
-#endif
+#endif /* DEBUG */
        if ((( rc = test_header() ) > 0 ) && 
                ( bin_header_read( fh, rc ) == 0 )) {
            return( 0 );
@@ -108,7 +116,7 @@ bin_open( binfile, flags, fh, options )
 #if DEBUG
          fprintf( stderr, "sizeof bin.path\t\t\t%d\n", sizeof( bin.path ));
          fprintf( stderr, "maxlen \t\t\t\t%d\n", maxlen );
-#endif
+#endif /* DEBUG */
          strncpy( bin.path, fh->name, maxlen );
          strncpy( bin.path, mtoupath( bin.path ), maxlen );
          strncat( bin.path, ".bin", maxlen - strlen( bin.path ));
@@ -119,7 +127,7 @@ bin_open( binfile, flags, fh, options )
 #if DEBUG
          fprintf( stderr, "opened %s for write\n", 
                   (options & OPTION_STDOUT) ? "(stdout)" : bin.path );
-#endif
+#endif /* DEBUG */
        }
 
        if ( bin_header_write( fh ) != 0 ) {
@@ -137,12 +145,12 @@ bin_open( binfile, flags, fh, options )
  * Otherwise, a value of -1 is returned.
  */
 
-bin_close( keepflag )
+int bin_close( keepflag )
     int                        keepflag;
 {
 #if DEBUG
     fprintf( stderr, "entering bin_close\n" );
-#endif
+#endif /* DEBUG */
     if ( keepflag == KEEP ) {
        return( close( bin.filed ));
     } else if ( keepflag == TRASH ) {
@@ -162,7 +170,7 @@ bin_close( keepflag )
  * return zero and no more than that.
  */
 
-bin_read( fork, buffer, length )
+int bin_read( fork, buffer, length )
     int                        fork;
     char               *buffer;
     int                        length;
@@ -175,7 +183,7 @@ bin_read( fork, buffer, length )
 #if DEBUG >= 3
     fprintf( stderr, "bin_read: fork is %s\n", forkname[ fork ] );
     fprintf( stderr, "bin_read: remaining length is %d\n", bin.forklen[fork] );
-#endif
+#endif /* DEBUG >= 3 */
 
     if ( bin.forklen[ fork ] < 0 ) {
        fprintf( stderr, "This should never happen, dude!\n" );
@@ -187,13 +195,14 @@ bin_read( fork, buffer, length )
            pos = lseek( bin.filed, 0, SEEK_CUR );
 #if DEBUG
            fprintf( stderr, "current position is %ld\n", pos );
-#endif
-           if (pos = pos % HEADBUFSIZ) {
+#endif /* DEBUG */
+           pos %= HEADBUFSIZ;
+           if (pos != 0) {
              pos = lseek( bin.filed, HEADBUFSIZ - pos, SEEK_CUR );
            }
 #if DEBUG
            fprintf( stderr, "current position is %ld\n", pos );
-#endif
+#endif /* DEBUG */
        }
        return( 0 );
     }
@@ -206,14 +215,14 @@ bin_read( fork, buffer, length )
 #if DEBUG >= 3
     fprintf( stderr, "bin_read: readlen is %d\n", readlen );
     fprintf( stderr, "bin_read: cc is %d\n", cc );
-#endif
+#endif /* DEBUG >= 3 */
 
     buf_ptr = buffer;
     while (( readlen > 0 ) && ( cc > 0 )) {
        if (( cc = read( bin.filed, buf_ptr, readlen )) > 0 ) {
 #if DEBUG >= 3
            fprintf( stderr, "bin_read: cc is %d\n", cc );
-#endif
+#endif /* DEBUG >= 3 */
            readlen -= cc;
            buf_ptr += cc;
        }
@@ -225,7 +234,7 @@ bin_read( fork, buffer, length )
 
 #if DEBUG >= 3
     fprintf( stderr, "bin_read: chars read is %d\n", cc );
-#endif
+#endif /* DEBUG >= 3 */
     return( cc );
 }
 
@@ -233,7 +242,7 @@ bin_read( fork, buffer, length )
  * bin_write 
  */
 
-bin_write( fork, buffer, length )
+int bin_write( fork, buffer, length )
     int                        fork;
     char               *buffer;
     int                        length;
@@ -249,7 +258,7 @@ bin_write( fork, buffer, length )
 #if DEBUG >= 3
     fprintf( stderr, "bin_write: fork is %s\n", forkname[ fork ] );
     fprintf( stderr, "bin_write: remaining length is %d\n", bin.forklen[fork] );
-#endif
+#endif /* DEBUG >= 3 */
 
     if (( fork == RESOURCE ) && ( bin.forklen[ DATA ] != 0 )) {
        fprintf( stderr, "Forklength error.\n" );
@@ -266,7 +275,7 @@ bin_write( fork, buffer, length )
 
 #if DEBUG >= 3
     fprintf( stderr, "bin_write: write length is %d\n", writelen );
-#endif
+#endif /* DEBUG >= 3 */
 
     while (( writelen > 0 ) && ( cc >= 0 )) {
        cc = write( bin.filed, buf_ptr, writelen );
@@ -292,8 +301,9 @@ bin_write( fork, buffer, length )
        pos = lseek( bin.filed, 0, SEEK_CUR );
 #if DEBUG
        fprintf( stderr, "current position is %ld\n", pos );
-#endif
-       if (pos = pos % HEADBUFSIZ) { /* pad only if we need to */
+#endif /* DEBUG */
+       pos %= HEADBUFSIZ;
+       if (pos != 0) { /* pad only if we need to */
          pos = lseek( bin.filed, HEADBUFSIZ - pos - 1, SEEK_CUR );
          if ( write( bin.filed, &padchar, 1 ) != 1 ) {
            perror( "Couldn't write to macbinary file:" );
@@ -302,12 +312,12 @@ bin_write( fork, buffer, length )
        }
 #if DEBUG
          fprintf( stderr, "current position is %ld\n", pos );
-#endif
+#endif /* DEBUG */
     }
 
 #if DEBUG
        fprintf( stderr, "\n" );
-#endif
+#endif /* DEBUG */
 
     return( length );
 }
@@ -318,7 +328,7 @@ bin_write( fork, buffer, length )
  * of the bytes of the other two forks can be read, as well.
  */
 
-bin_header_read( fh, revision )
+int bin_header_read( fh, revision )
     struct FHeader     *fh;
     int                        revision;
 {
@@ -363,7 +373,7 @@ bin_header_read( fh, revision )
 #ifndef MACBINARY_PLAY_NICE_WITH_OTHERS /* (RLB) */
     memcpy( &fh->finder_info.fdFlags, head_buf + 73, 1 );
     fh->finder_info.fdFlags &= mask;
-#else
+#else /* ! MACBINARY_PLAY_NICE_WITH_OTHERS */
        memcpy( &fh->finder_info.fdFlags, head_buf + 73, 2 );
 #endif /* ! MACBINARY_PLAY_NICE_WITH_OTHERS */
 
@@ -408,7 +418,7 @@ bin_header_read( fh, revision )
        fprintf( stderr, "resource fork length\t%ld\n", bin.forklen[RESOURCE] );
        fprintf( stderr, "\n" );
     }
-#endif
+#endif /* DEBUG >= 5 */
 
     return( 0 );
 }
@@ -420,7 +430,7 @@ bin_header_read( fh, revision )
  * bin_header_write and bin_header_read are opposites.
  */
 
-bin_header_write( fh )
+int bin_header_write( fh )
     struct FHeader     *fh;
 {
     char               *write_ptr;
@@ -435,7 +445,7 @@ bin_header_write( fh )
 
 #ifndef MACBINARY_PLAY_NICE_WITH_OTHERS /* (RLB) */
     memcpy( head_buf + 73, &fh->finder_info.fdFlags, 1 );
-#else
+#else /* ! MACBINARY_PLAY_NICE_WITH_OTHERS */
     memcpy( head_buf + 73, &fh->finder_info.fdFlags, 2 );
 #endif /* ! MACBINARY_PLAY_NICE_WITH_OTHERS */
 
@@ -490,7 +500,7 @@ bin_header_write( fh )
        fprintf( stderr, "resource fork length\t%ld\n", bin.forklen[RESOURCE] );
        fprintf( stderr, "\n" );
     }
-#endif
+#endif /* DEBUG >= 5 */
 
     write_ptr = (char *)head_buf;
     wc = sizeof( head_buf );
@@ -526,7 +536,7 @@ bin_header_write( fh )
  * so, the check for byte 74 isn't very useful.
  */
 
-test_header()
+int test_header(void)
 {
     const char          zeros[25] = "";
     u_int32_t          cc;
@@ -535,7 +545,7 @@ test_header()
 
 #if DEBUG
     fprintf( stderr, "entering test_header\n" );
-#endif
+#endif /* DEBUG */
 
     cc = read( bin.filed, (char *)head_buf, sizeof( head_buf ));
     if ( cc < sizeof( head_buf )) {
@@ -545,7 +555,7 @@ test_header()
 
 #if DEBUG
     fprintf( stderr, "was able to read HEADBUFSIZ bytes\n" );
-#endif
+#endif /* DEBUG */
 
     /* check for macbinary III header */
     if (memcmp(head_buf + 102, "mBIN", 4) == 0)
@@ -555,7 +565,7 @@ test_header()
     if (( head_buf[ 0 ] == 0 ) || ( head_buf[ 74 ] == 0 )) {
 #if DEBUG
       fprintf( stderr, "byte 0 and 74 are both zero\n" );
-#endif
+#endif /* DEBUG */
       bin.headercrc = updcrc( (u_short) 0, head_buf, 124 );
       memcpy(&header_crc, head_buf + 124, sizeof( header_crc ));
       header_crc = ntohs( header_crc );
@@ -565,7 +575,7 @@ test_header()
 
 #if DEBUG
       fprintf( stderr, "header crc didn't pan out\n" );
-#endif
+#endif /* DEBUG */
     }
 
     /* now see if we have a macbinary file. */
@@ -575,7 +585,7 @@ test_header()
     memcpy( &namelen, head_buf + 1, sizeof( namelen ));
 #if DEBUG
     fprintf( stderr, "name length is %d\n", namelen );
-#endif
+#endif /* DEBUG */
     if (( namelen < 1 ) || ( namelen > 63 )) {
        return( -1 );
     }
@@ -597,7 +607,7 @@ test_header()
 
 #if DEBUG
     fprintf( stderr, "byte 82 is zero and name length is cool\n" );
-#endif
+#endif /* DEBUG */
 
     return( 1 );
 }