home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
Dream 49
/
Amiga_Dream_49.iso
/
beos
/
utils
/
mkisofs-1.000
/
mkisofs-1.11-beos
/
BeOS.diffs
< prev
next >
Wrap
Text File
|
1998-01-25
|
11KB
|
365 lines
Only in .: 00-notes
Only in .: BeOS.diffs
Only in .: Makefile
Only in ../mkisofs-1.11: cdwrite.c.diff
Only in .: config.cache
Only in .: config.h
Only in .: config.log
Only in .: config.status
Only in ./diag: Makefile
Only in .: eltorito.o
Only in .: exclude.o
Only in .: files.o
diff -r -c -w -b ../mkisofs-1.11/fnmatch.c ./fnmatch.c
*** ../mkisofs-1.11/fnmatch.c Wed Apr 9 23:41:45 1997
--- ./fnmatch.c Sun Jan 25 15:42:00 1998
***************
*** 17,30 ****
along with this program; if not, write to the Free Software
Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
! static char rcsid[] ="$Id: fnmatch.c,v 1.3 1997/03/22 02:53:13 eric Rel $";
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <errno.h>
#include <fnmatch.h>
#ifndef FNM_FILE_NAME
#define FNM_FILE_NAME FNM_PATHNAME /* Preferred GNU name. */
--- 17,34 ----
along with this program; if not, write to the Free Software
Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
! static char rcsid[] ="$Id: fnmatch.c,v 1.1 1998/01/25 20:40:38 chrish Exp chrish $";
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <errno.h>
+ #ifndef __BEOS__
#include <fnmatch.h>
+ #else
+ #include "fnmatch.h"
+ #endif
#ifndef FNM_FILE_NAME
#define FNM_FILE_NAME FNM_PATHNAME /* Preferred GNU name. */
Only in .: fnmatch.o
Only in .: hash.o
Only in .: match.o
Only in .: mkisofs
Only in .: mkisofs.8.ps
Only in .: mkisofs.o
diff -r -c -w -b ../mkisofs-1.11/multi.c ./multi.c
*** ../mkisofs-1.11/multi.c Wed Apr 9 23:41:48 1997
--- ./multi.c Sun Jan 25 15:42:22 1998
***************
*** 19,25 ****
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
! static char rcsid[] ="$Id: multi.c,v 1.4 1997/03/08 17:08:53 eric Rel $";
#include <stdlib.h>
#include <string.h>
--- 19,25 ----
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
! static char rcsid[] ="$Id: multi.c,v 1.1 1998/01/25 20:38:07 chrish Exp chrish $";
#include <stdlib.h>
#include <string.h>
***************
*** 278,293 ****
* First, allocate a buffer large enough to read in the entire
* directory.
*/
! dirbuff = (char *) e_malloc(isonum_733(mrootp->size));
! readsecs(isonum_733(mrootp->extent), dirbuff,
! isonum_733(mrootp->size)/SECTOR_SIZE);
/*
* Next look over the directory, and count up how many entries we
* have.
*/
! len = isonum_733(mrootp->size);
i = 0;
*nent = 0;
while(i < len )
--- 278,293 ----
* First, allocate a buffer large enough to read in the entire
* directory.
*/
! dirbuff = (char *) e_malloc(isonum_733((unsigned char *)mrootp->size));
! readsecs(isonum_733((unsigned char *)mrootp->extent), dirbuff,
! isonum_733((unsigned char *)mrootp->size)/SECTOR_SIZE);
/*
* Next look over the directory, and count up how many entries we
* have.
*/
! len = isonum_733((unsigned char *)mrootp->size);
i = 0;
*nent = 0;
while(i < len )
***************
*** 329,336 ****
*pnt = (struct directory_entry *) e_malloc(sizeof(**rtn));
(*pnt)->next = NULL;
(*pnt)->isorec = *idr;
! (*pnt)->starting_block = isonum_733(idr->extent);
! (*pnt)->size = isonum_733(idr->size);
(*pnt)->priority = 0;
(*pnt)->name = NULL;
(*pnt)->table = NULL;
--- 329,336 ----
*pnt = (struct directory_entry *) e_malloc(sizeof(**rtn));
(*pnt)->next = NULL;
(*pnt)->isorec = *idr;
! (*pnt)->starting_block = isonum_733((unsigned char *)idr->extent);
! (*pnt)->size = isonum_733((unsigned char *)idr->size);
(*pnt)->priority = 0;
(*pnt)->name = NULL;
(*pnt)->table = NULL;
***************
*** 412,419 ****
free((*pnt)->name);
}
(*pnt)->name = strdup("<translation table>");
! tt_extent = isonum_733(idr->extent);
! tt_size = isonum_733(idr->size);
}
pnt++;
--- 412,419 ----
free((*pnt)->name);
}
(*pnt)->name = strdup("<translation table>");
! tt_extent = isonum_733((unsigned char *)idr->extent);
! tt_size = isonum_733((unsigned char *)idr->size);
}
pnt++;
***************
*** 680,686 ****
vdp = (struct iso_volume_descriptor *)buffer;
if( (strncmp(vdp->id, ISO_STANDARD_ID, sizeof vdp->id) == 0)
! && (isonum_711(vdp->type) == ISO_VD_PRIMARY) )
{
break;
}
--- 680,686 ----
vdp = (struct iso_volume_descriptor *)buffer;
if( (strncmp(vdp->id, ISO_STANDARD_ID, sizeof vdp->id) == 0)
! && (isonum_711((unsigned char *)vdp->type) == ISO_VD_PRIMARY) )
{
break;
}
***************
*** 697,704 ****
/*
* Check the blocksize of the image to make sure it is compatible.
*/
! if( (isonum_723 (pri->logical_block_size) != SECTOR_SIZE)
! || (isonum_723 (pri->volume_set_size) != 1) )
{
return NULL;
}
--- 697,704 ----
/*
* Check the blocksize of the image to make sure it is compatible.
*/
! if( (isonum_723 ((unsigned char *)pri->logical_block_size) != SECTOR_SIZE)
! || (isonum_723 ((unsigned char *)pri->volume_set_size) != 1) )
{
return NULL;
}
***************
*** 737,743 ****
if( pnt[i]->name != NULL
&& strcmp(pnt[i]->name, "<translation table>") == 0 )
{
! ttbl_extent = isonum_733(pnt[i]->isorec.extent);
ttbl_index = i;
continue;
}
--- 737,743 ----
if( pnt[i]->name != NULL
&& strcmp(pnt[i]->name, "<translation table>") == 0 )
{
! ttbl_extent = isonum_733((unsigned char *)pnt[i]->isorec.extent);
ttbl_index = i;
continue;
}
Only in .: multi.o
Only in .: name.o
diff -r -c -w -b ../mkisofs-1.11/rock.c ./rock.c
*** ../mkisofs-1.11/rock.c Wed Apr 9 23:41:49 1997
--- ./rock.c Sun Jan 25 15:37:50 1998
***************
*** 19,25 ****
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
! static char rcsid[] ="$Id: rock.c,v 1.2 1997/02/23 16:08:07 eric Rel $";
#include <stdlib.h>
--- 19,25 ----
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
! static char rcsid[] ="$Id: rock.c,v 1.1 1998/01/25 20:37:36 chrish Exp chrish $";
#include <stdlib.h>
***************
*** 266,272 ****
int lenpos, lenval, j0, j1;
int nchar;
unsigned char * cpnt, *cpnt1;
! nchar = readlink(whole_name, symlink_buff, sizeof(symlink_buff));
symlink_buff[nchar < 0 ? 0 : nchar] = 0;
set_733(s_entry->isorec.size, 0);
cpnt = &symlink_buff[0];
--- 266,272 ----
int lenpos, lenval, j0, j1;
int nchar;
unsigned char * cpnt, *cpnt1;
! nchar = readlink(whole_name, (char *)symlink_buff, sizeof(symlink_buff));
symlink_buff[nchar < 0 ? 0 : nchar] = 0;
set_733(s_entry->isorec.size, 0);
cpnt = &symlink_buff[0];
Only in .: rock.o
diff -r -c -w -b ../mkisofs-1.11/tree.c ./tree.c
*** ../mkisofs-1.11/tree.c Wed Apr 9 23:41:49 1997
--- ./tree.c Sun Jan 25 15:34:22 1998
***************
*** 20,26 ****
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
! static char rcsid[] ="$Id: tree.c,v 1.7 1997/03/25 03:55:28 eric Rel $";
/* ADD_FILES changes made by Ross Biro biro@yggdrasil.com 2/23/95 */
--- 20,26 ----
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
! static char rcsid[] ="$Id: tree.c,v 1.1 1998/01/25 20:34:15 chrish Exp chrish $";
/* ADD_FILES changes made by Ross Biro biro@yggdrasil.com 2/23/95 */
***************
*** 1072,1078 ****
break;
case S_IFLNK:
nchar = readlink(whole_path,
! symlink_buff,
sizeof(symlink_buff));
symlink_buff[nchar < 0 ? 0 : nchar] = 0;
sprintf(buffer,"L\t%s\t%s\n",
--- 1072,1078 ----
break;
case S_IFLNK:
nchar = readlink(whole_path,
! (char *)symlink_buff,
sizeof(symlink_buff));
symlink_buff[nchar < 0 ? 0 : nchar] = 0;
sprintf(buffer,"L\t%s\t%s\n",
Only in .: tree.o
diff -r -c -w -b ../mkisofs-1.11/write.c ./write.c
*** ../mkisofs-1.11/write.c Wed Apr 9 23:43:02 1997
--- ./write.c Sun Jan 25 16:10:34 1998
***************
*** 19,28 ****
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
! static char rcsid[] ="$Id: write.c,v 1.4 1997/04/10 03:33:25 eric Rel $";
#include <string.h>
#include <stdlib.h>
#include "mkisofs.h"
#include "iso9660.h"
#include <time.h>
--- 19,32 ----
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
! static char rcsid[] ="$Id: write.c,v 1.1 1998/01/25 20:34:41 chrish Exp chrish $";
#include <string.h>
#include <stdlib.h>
+ #ifdef __BEOS__
+ /* So we don't define NAME_MAX twice. */
+ #include <limits.h>
+ #endif
#include "mkisofs.h"
#include "iso9660.h"
#include <time.h>
***************
*** 197,207 ****
--- 201,222 ----
static void FDECL3(write_one_file, char *, filename,
unsigned int, size, FILE *, outfile)
{
+ #ifndef __BEOS__
char buffer[SECTOR_SIZE * NSECT];
+ #else
+ char * buffer;
+ #endif
FILE * infile;
int remain;
int use;
+ #ifdef __BEOS__
+ buffer = (char *)malloc( SECTOR_SIZE * NSECT );
+ if( buffer == NULL ) {
+ fprintf( stderr, "ARGH, no memory for sector buffer\n" );
+ exit( 1 );
+ }
+ #endif
if ((infile = fopen(filename, "rb")) == NULL)
{
***************
*** 248,253 ****
--- 263,270 ----
remain -= use;
}
fclose(infile);
+
+ free( buffer );
} /* write_one_file(... */
static void FDECL1(write_files, FILE *, outfile)
***************
*** 425,431 ****
* we don't end up scheduling the thing for writing
* either.
*/
! if( isonum_733(s_entry->isorec.extent) != 0 )
{
continue;
}
--- 442,448 ----
* we don't end up scheduling the thing for writing
* either.
*/
! if( isonum_733((unsigned char *)s_entry->isorec.extent) != 0 )
{
continue;
}
Only in .: write.o