- merge branch-netatalk-afp-3x-dev, HEAD was tagged before

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

diff --git a/bin/megatron/asingle.c b/bin/megatron/asingle.c
index 6ef52b8606a066ec25adbdd27120d4ecb35329e9..0d2faea90bc1a10ea04248119942382a7897a8f8 100644 (file)
--- a/bin/megatron/asingle.c
+++ b/bin/megatron/asingle.c
@@ -1,5 +1,5 @@
 /*
- * $Id: asingle.c,v 1.9 2003-08-09 14:28:36 srittau Exp $
+ * $Id: asingle.c,v 1.10 2005-04-28 20:49:19 bfernhomberg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -64,7 +64,7 @@ u_char                header_buf[ AD_HEADER_LEN ];
 
 int single_open( singlefile, flags, fh, options )
     char               *singlefile;
-    int                        flags, options;
+    int                        flags, options _U_;
     struct FHeader     *fh;
 {
     int                        rc;
@@ -268,7 +268,7 @@ int single_header_read( fh, version )
  * Unless I can't get the current date, in which case use time zero.
  */
     if (( date_entry < 7 ) || ( date_entry > 8 )) {
-       if (( time_seconds = time( NULL )) == -1 ) {
+       if (( time_seconds = time( NULL )) == (u_int32_t)-1 ) {
            time_seconds = AD_DATE_START;
        } else {
            time_seconds = AD_DATE_FROM_UNIX(time_seconds);
@@ -344,11 +344,11 @@ u_char            sixteennulls[] = { 0, 0, 0, 0, 0, 0, 0, 0,
 
 int single_header_test(void)
 {
-    int                        cc;
+    ssize_t            cc;
     u_int32_t          templong;
 
     cc = read( single.filed, (char *)header_buf, sizeof( header_buf ));
-    if ( cc < sizeof( header_buf )) {
+    if ( cc < (ssize_t)sizeof( header_buf )) {
        perror( "Premature end of file :" );
        return( -1 );
     }
@@ -398,7 +398,7 @@ int single_header_test(void)
 int single_read( fork, buffer, length )
     int                        fork;
     char               *buffer;
-    int                        length;
+    u_int32_t          length;
 {
     u_int32_t          entry_id;
     char               *buf_ptr;
@@ -418,9 +418,9 @@ int single_read( fork, buffer, length )
            break;
     }
 
-    if ( single.entry[ entry_id ].ade_len < 0 ) {
-       fprintf( stderr, "single_read: Trying to read past end of fork!\n" );
-       return( single.entry[ entry_id ].ade_len );
+    if (single.entry[entry_id].ade_len > length) {
+       fprintf(stderr, "single_read: Trying to read past end of fork!, length %d, ade_len == %u\n", length, single.entry[entry_id].ade_len);
+       return single.entry[entry_id].ade_len;
     }
     if ( single.entry[ entry_id ].ade_len == 0 ) {
        if ( fork == DATA ) {