Re: user/3927: ls on iso9660 displays negative filesize

[Michael Shalayeff <mickey_(_at_)_lucifier_(_dot_)_net>]

The following reply was made to PR user/3927; it has been noted by GNATS.

From: Michael Shalayeff <mickey_(_at_)_lucifier_(_dot_)_net>
To: bauer_(_at_)_i1_(_dot_)_informatik_(_dot_)_uni-erlangen_(_dot_)_de
Cc: gnats_(_at_)_openbsd_(_dot_)_org
Subject: Re: user/3927: ls on iso9660 displays negative filesize
Date: Fri, 17 Sep 2004 18:58:48 -0400 (EDT)

 re
 can you try this patch please:
 
 
 Index: cd9660_node.h
 ===================================================================
 RCS file: /cvs/src/sys/isofs/cd9660/cd9660_node.h,v
 retrieving revision 1.16
 diff -u -r1.16 cd9660_node.h
 --- cd9660_node.h	2003/09/23 16:51:12	1.16
 +++ cd9660_node.h	2004/09/17 23:04:02
 @@ -87,9 +87,9 @@
  	ino_t	i_ino;		/* inode number of found directory */
  	struct  lock i_lock;    /* node lock */
  
 -	long iso_extent;	/* extent of file */
 -	long i_size;
 -	long iso_start;		/* actual start of data of file (may be different */
 +	u_int iso_extent;	/* extent of file */
 +	u_int i_size;
 +	u_int iso_start;	/* actual start of data of file (may be different */
  				/* from iso_extent, if file has extended attributes) */
  	ISO_RRIP_INODE  inode;
  	struct cluster_info i_ci; 
 Index: iso.h
 ===================================================================
 RCS file: /cvs/src/sys/isofs/cd9660/iso.h,v
 retrieving revision 1.13
 diff -u -r1.13 iso.h
 --- iso.h	2003/06/02 23:28:05	1.13
 +++ iso.h	2004/09/17 23:04:02
 @@ -175,17 +175,17 @@
  	u_char len_au			[ISODCL (247, 250)]; /* 723 */
  };
  
 -static __inline int isonum_711(u_char *) __attribute__ ((__unused__));
 +static __inline u_int isonum_711(u_char *) __attribute__ ((__unused__));
  static __inline int isonum_712(char *) __attribute__ ((__unused__));
 -static __inline int isonum_721(u_char *) __attribute__ ((__unused__));
 -static __inline int isonum_722(u_char *) __attribute__ ((__unused__));
 -static __inline int isonum_723(u_char *) __attribute__ ((__unused__));
 -static __inline int isonum_731(u_char *) __attribute__ ((__unused__));
 -static __inline int isonum_732(u_char *) __attribute__ ((__unused__));
 -static __inline int isonum_733(u_char *) __attribute__ ((__unused__));
 +static __inline u_int isonum_721(u_char *) __attribute__ ((__unused__));
 +static __inline u_int isonum_722(u_char *) __attribute__ ((__unused__));
 +static __inline u_int isonum_723(u_char *) __attribute__ ((__unused__));
 +static __inline u_int isonum_731(u_char *) __attribute__ ((__unused__));
 +static __inline u_int isonum_732(u_char *) __attribute__ ((__unused__));
 +static __inline u_int isonum_733(u_char *) __attribute__ ((__unused__));
  
  /* 7.1.1: unsigned char */
 -static __inline int
 +static __inline u_int
  isonum_711(u_char *p)
  {
  	return *p;
 @@ -199,7 +199,7 @@
  }
  
  /* 7.2.1: unsigned little-endian 16-bit value.  NOT USED IN KERNEL. */
 -static __inline int
 +static __inline u_int
  isonum_721(p)
  	u_char *p;
  {
 @@ -211,7 +211,7 @@
  }
  
  /* 7.2.2: unsigned big-endian 16-bit value.  NOT USED IN KERNEL. */
 -static __inline int     
 +static __inline u_int     
  isonum_722(p)
  	unsigned char *p;
  {
 @@ -223,7 +223,7 @@
  } 
  
  /* 7.2.3: unsigned both-endian (little, then big) 16-bit value */
 -static __inline int
 +static __inline u_int
  isonum_723(u_char *p)
  {
  #if defined(UNALIGNED_ACCESS) && \
 @@ -239,7 +239,7 @@
  }
  
  /* 7.3.1: unsigned little-endian 32-bit value.  NOT USED IN KERNEL. */
 -static __inline int
 +static __inline u_int
  isonum_731(p)
  	u_char *p;
  {
 @@ -251,7 +251,7 @@
  }
  
  /* 7.3.2: unsigned big-endian 32-bit value.  NOT USED IN KERNEL. */
 -static __inline int
 +static __inline u_int
  isonum_732(p)
  	unsigned char *p;
  {
 @@ -263,7 +263,7 @@
  }
  
  /* 7.3.3: unsigned both-endian (little, then big) 32-bit value */
 -static __inline int
 +static __inline u_int
  isonum_733(u_char *p)
  {
  #if defined(UNALIGNED_ACCESS) && \
 
 -- 
     paranoic mickey       (my employers have changed but, the name has remained)