fuse-emulator-cvs — SCM commits for Fuse (the Free Unix Spectrum Emulator), the associated utilities and libspectrum, the ZX Spectrum file format handling library

[fuse-emulator-cvs] libspectrum libspectrum.c,1.61,1.62 libspectrum.h.in,1.96,1.97

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/libspectrum
In directory sc8-pr-cvs1:/tmp/cvs-serv27414

Modified Files:
	libspectrum.c libspectrum.h.in 
Log Message:
Add routines to get the version of libgcrypt in use.


Index: libspectrum.c
===================================================================
RCS file: /cvsroot/fuse-emulator/libspectrum/libspectrum.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** libspectrum.c	13 Oct 2003 14:25:43 -0000	1.61
--- libspectrum.c	13 Oct 2003 20:16:39 -0000	1.62
***************
*** 39,42 ****
--- 39,44 ----
  #endif				/* #ifdef HAVE_GCRYPT_H */
  
+ static const char *gcrypt_version;
+ 
  #include "internals.h"
  
***************
*** 51,64 ****
  #ifdef HAVE_GCRYPT_H
  
-   const char *version;
- 
    if( !gcry_control( GCRYCTL_ANY_INITIALIZATION_P ) ) {
  
!     version = gcry_check_version( MIN_GCRYPT_VERSION );
!     if( !version ) {
        libspectrum_print_error(
          LIBSPECTRUM_ERROR_LOGIC,
  	"libspectrum_init: found libgcrypt %s, but need %s",
! 	version, MIN_GCRYPT_VERSION
        );
        return LIBSPECTRUM_ERROR_LOGIC;	/* FIXME: better error code */
--- 53,64 ----
  #ifdef HAVE_GCRYPT_H
  
    if( !gcry_control( GCRYCTL_ANY_INITIALIZATION_P ) ) {
  
!     gcrypt_version = gcry_check_version( MIN_GCRYPT_VERSION );
!     if( !gcrypt_version ) {
        libspectrum_print_error(
          LIBSPECTRUM_ERROR_LOGIC,
  	"libspectrum_init: found libgcrypt %s, but need %s",
! 	gcry_check_version( NULL ), MIN_GCRYPT_VERSION
        );
        return LIBSPECTRUM_ERROR_LOGIC;	/* FIXME: better error code */
***************
*** 75,78 ****
--- 75,82 ----
    }
  
+ #else				/* #ifdef HAVE_GCRYPT_H */
+ 
+   gcrypt_version = NULL;
+ 
  #endif				/* #ifdef HAVE_GCRYPT_H */
  
***************
*** 110,113 ****
--- 114,123 ----
  {
    return VERSION;
+ }
+ 
+ const char *
+ libspectrum_gcrypt_version( void )
+ {
+   return gcrypt_version;
  }
  

Index: libspectrum.h.in
===================================================================
RCS file: /cvsroot/fuse-emulator/libspectrum/libspectrum.h.in,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** libspectrum.h.in	13 Oct 2003 14:25:43 -0000	1.96
--- libspectrum.h.in	13 Oct 2003 20:16:39 -0000	1.97
***************
*** 79,82 ****
--- 79,83 ----
  int libspectrum_check_version( const char *version );
  const char *libspectrum_version( void );
+ const char *libspectrum_gcrypt_version( void );
  
  /* Error handling */

[fuse-emulator-cvs] libspectrum/hacking ChangeLog,1.20,1.21

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/libspectrum/hacking
In directory sc8-pr-cvs1:/tmp/cvs-serv27414/hacking

Modified Files:
	ChangeLog 
Log Message:
Add routines to get the version of libgcrypt in use.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/libspectrum/hacking/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** ChangeLog	13 Oct 2003 14:25:43 -0000	1.20
--- ChangeLog	13 Oct 2003 20:16:39 -0000	1.21
***************
*** 110,111 ****
--- 110,113 ----
  20031013 libspectrum.c, libspectrum.h.in: add routines to check
  	 libspectrum's version.
+ 20031013 libspectrum.c, libspectrum.h.in: add routines to get the version
+ 	 of libgcrypt in use.

[fuse-emulator-cvs] fuse-utils/hacking ChangeLog,1.12,1.13

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse-utils/hacking
In directory sc8-pr-cvs1:/tmp/cvs-serv4325/hacking

Modified Files:
	ChangeLog 
Log Message:
Put libspectrum version into creator information, and ensure that
libspectrum_init is called by all programs which use libspectrum functions.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse-utils/hacking/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ChangeLog	10 Oct 2003 16:38:00 -0000	1.12
--- ChangeLog	13 Oct 2003 15:42:26 -0000	1.13
***************
*** 50,51 ****
--- 50,54 ----
  20031009 utils.c: add information from uname() into creator custom data.
  20031010 utils.c: on Solaris, uname() returns 1 to indicate success.
+ 20031013 Put libspectrum version into creator information, and ensure that
+ 	 libspectrum_init is called by all programs which use libspectrum
+ 	 functions.

[fuse-emulator-cvs] fuse-utils listbasic.c,1.9,1.10 rzxcheck.c,1.4,1.5 rzxtool.c,1.19,1.20 snapconv.c,1.2,1.3 tapeconv.c,1.12,1.13 tzxlist.c,1.35,1.36 utils.c,1.4,1.5 utils.h,1.3,1.4

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse-utils
In directory sc8-pr-cvs1:/tmp/cvs-serv4325

Modified Files:
	listbasic.c rzxcheck.c rzxtool.c snapconv.c tapeconv.c 
	tzxlist.c utils.c utils.h 
Log Message:
Put libspectrum version into creator information, and ensure that
libspectrum_init is called by all programs which use libspectrum functions.


Index: listbasic.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse-utils/listbasic.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** listbasic.c	22 Jul 2003 20:49:00 -0000	1.9
--- listbasic.c	13 Oct 2003 15:42:25 -0000	1.10
***************
*** 75,78 ****
--- 75,80 ----
    }
  
+   error = init_libspectrum(); if( error ) return error;
+ 
    error = mmap_file( argv[1], &buffer, &length ); if( error ) return error;
  

Index: rzxcheck.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse-utils/rzxcheck.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** rzxcheck.c	6 Oct 2003 21:45:36 -0000	1.4
--- rzxcheck.c	13 Oct 2003 15:42:25 -0000	1.5
***************
*** 58,62 ****
    progname = argv[0];
  
!   if( libspectrum_init() ) return 16;
  
    if( argc < 2 ) {
--- 58,62 ----
    progname = argv[0];
  
!   if( init_libspectrum() ) return 16;
  
    if( argc < 2 ) {

Index: rzxtool.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse-utils/rzxtool.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** rzxtool.c	24 Aug 2003 13:20:44 -0000	1.19
--- rzxtool.c	13 Oct 2003 15:42:26 -0000	1.20
***************
*** 66,69 ****
--- 66,70 ----
    unsigned char *buffer; size_t length;
    unsigned char *snap_buffer; size_t snap_length;
+   int error;
  
    libspectrum_rzx *rzx;
***************
*** 75,79 ****
    progname = argv[0];
  
!   if( libspectrum_init() ) return 1;
  
    init_options( &options );
--- 76,80 ----
    progname = argv[0];
  
!   error = init_libspectrum(); if( error ) return error;
  
    init_options( &options );

Index: snapconv.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse-utils/snapconv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** snapconv.c	16 Jun 2003 01:41:30 -0000	1.2
--- snapconv.c	13 Oct 2003 15:42:26 -0000	1.3
***************
*** 60,63 ****
--- 60,65 ----
    }
  
+   error = init_libspectrum(); if( error ) return error;
+ 
    error = libspectrum_snap_alloc( &snap ); if( error ) return error;
  

Index: tapeconv.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse-utils/tapeconv.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tapeconv.c	7 Oct 2003 10:45:29 -0000	1.12
--- tapeconv.c	13 Oct 2003 15:42:26 -0000	1.13
***************
*** 47,51 ****
  main( int argc, char **argv )
  {
!   int c;
    char *input_type_string = NULL; libspectrum_id_t input_type;
    char *output_type_string = NULL; libspectrum_id_t output_type;
--- 47,51 ----
  main( int argc, char **argv )
  {
!   int c, error;
    char *input_type_string = NULL; libspectrum_id_t input_type;
    char *output_type_string = NULL; libspectrum_id_t output_type;
***************
*** 53,56 ****
--- 53,58 ----
  
    progname = argv[0];
+ 
+   error = init_libspectrum(); if( error ) return error;
  
    /* Don't screw up people's terminals */

Index: tzxlist.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse-utils/tzxlist.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** tzxlist.c	12 Aug 2003 14:26:24 -0000	1.35
--- tzxlist.c	13 Oct 2003 15:42:26 -0000	1.36
***************
*** 283,286 ****
--- 283,287 ----
    int ret = 0;
    int arg = 0;
+   int error;
  
    progname = argv[0];
***************
*** 290,293 ****
--- 291,296 ----
      return 1;
    }
+ 
+   error = init_libspectrum(); if( error ) return error;
  
    while( ++arg < argc )

Index: utils.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse-utils/utils.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** utils.c	10 Oct 2003 16:38:00 -0000	1.4
--- utils.c	13 Oct 2003 15:42:26 -0000	1.5
***************
*** 41,50 ****
--- 41,69 ----
  extern char *progname;
  
+ /* The minimum version of libspectrum we need */
+ static const char *LIBSPECTRUM_MIN_VERSION = "0.2.0";
+ 
+ int
+ init_libspectrum( void )
+ {
+   if( libspectrum_check_version( LIBSPECTRUM_MIN_VERSION ) ) {
+     if( libspectrum_init() ) return 1;
+   } else {
+     fprintf( stderr, "libspectrum version %s found, but %s required",
+ 	     libspectrum_version(), LIBSPECTRUM_MIN_VERSION );
+     return 1;
+   }
+ 
+   return 0;
+ }
+ 
  int
  get_creator( libspectrum_creator **creator, const char *program )
  {
    char *custom;
+   int version[4] = { 0, 0, 0, 0 };
    struct utsname buf;
    libspectrum_error error; int sys_error;
+   size_t i;
  
    sys_error = uname( &buf );
***************
*** 61,68 ****
    if( error ) { libspectrum_creator_free( *creator ); return error; }
  
!   error = libspectrum_creator_set_major( *creator, 0x0006 );
    if( error ) { libspectrum_creator_free( *creator ); return error; }
  
!   error = libspectrum_creator_set_minor( *creator, 0x0100 );
    if( error ) { libspectrum_creator_free( *creator ); return error; }
  
--- 80,93 ----
    if( error ) { libspectrum_creator_free( *creator ); return error; }
  
!   sscanf( VERSION, "%u.%u.%u.%u",
! 	  &version[0], &version[1], &version[2], &version[3] );
!   for( i=0; i<4; i++ ) if( version[i] > 0xff ) version[i] = 0xff;
! 
!   error = libspectrum_creator_set_major( *creator,
! 					 version[0] * 0x100 + version[1] );
    if( error ) { libspectrum_creator_free( *creator ); return error; }
  
!   error = libspectrum_creator_set_minor( *creator,
! 					 version[2] * 0x100 + version[3] );
    if( error ) { libspectrum_creator_free( *creator ); return error; }
  
***************
*** 75,80 ****
    }
  
!   snprintf( custom, 256, "uname: %s %s %s\n", buf.sysname, buf.machine,
! 	    buf.release );
  
    error = libspectrum_creator_set_custom( *creator,
--- 100,106 ----
    }
  
!   snprintf( custom, 256, "libspectrum: %s\nuname: %s %s %s\n",
! 	    libspectrum_version(),
! 	    buf.sysname, buf.machine, buf.release );
  
    error = libspectrum_creator_set_custom( *creator,

Index: utils.h
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse-utils/utils.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** utils.h	12 Aug 2003 14:26:24 -0000	1.3
--- utils.h	13 Oct 2003 15:42:26 -0000	1.4
***************
*** 30,33 ****
--- 30,34 ----
  #include <libspectrum.h>
  
+ int init_libspectrum( void );
  int get_creator( libspectrum_creator **creator, const char *program );
  int mmap_file( const char *filename, unsigned char **buffer, size_t *length );

[fuse-emulator-cvs] fuse/hacking ChangeLog,1.53,1.54

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse/hacking
In directory sc8-pr-cvs1:/tmp/cvs-serv25465/hacking

Modified Files:
	ChangeLog 
Log Message:
Add libspectrum version to the creator custom data.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/hacking/ChangeLog,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** ChangeLog	13 Oct 2003 14:26:52 -0000	1.53
--- ChangeLog	13 Oct 2003 14:49:02 -0000	1.54
***************
*** 273,275 ****
  20031012 rzx.c: reset rzx_competition_mode when starting a non-competition
  	 mode recording.
! 20031013 fuse.c: check libspectrum's version at startup.
\ No newline at end of file
--- 273,276 ----
  20031012 rzx.c: reset rzx_competition_mode when starting a non-competition
  	 mode recording.
! 20031013 fuse.c: check libspectrum's version at startup.
! 20031013 fuse.c: add libspectrum version to the creator custom data.

[fuse-emulator-cvs] fuse fuse.c,1.92,1.93

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse
In directory sc8-pr-cvs1:/tmp/cvs-serv25465

Modified Files:
	fuse.c 
Log Message:
Add libspectrum version to the creator custom data.


Index: fuse.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/fuse.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** fuse.c	13 Oct 2003 14:26:52 -0000	1.92
--- fuse.c	13 Oct 2003 14:49:00 -0000	1.93
***************
*** 284,289 ****
    }
  
!   snprintf( custom, 256, "uname: %s %s %s\n", buf.sysname, buf.machine,
! 	    buf.release );
  
    error = libspectrum_creator_set_custom( fuse_creator,
--- 284,290 ----
    }
  
!   snprintf( custom, 256, "libspectrum: %s\nuname: %s %s %s",
! 	    libspectrum_version(),
! 	    buf.sysname, buf.machine, buf.release );
  
    error = libspectrum_creator_set_custom( fuse_creator,

[fuse-emulator-cvs] fuse/hacking ChangeLog,1.52,1.53

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse/hacking
In directory sc8-pr-cvs1:/tmp/cvs-serv21561/hacking

Modified Files:
	ChangeLog 
Log Message:
Check libspectrum's version at startup.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/hacking/ChangeLog,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** ChangeLog	12 Oct 2003 18:39:09 -0000	1.52
--- ChangeLog	13 Oct 2003 14:26:52 -0000	1.53
***************
*** 273,274 ****
--- 273,275 ----
  20031012 rzx.c: reset rzx_competition_mode when starting a non-competition
  	 mode recording.
+ 20031013 fuse.c: check libspectrum's version at startup.
\ No newline at end of file

[fuse-emulator-cvs] fuse fuse.c,1.91,1.92

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse
In directory sc8-pr-cvs1:/tmp/cvs-serv21561

Modified Files:
	fuse.c 
Log Message:
Check libspectrum's version at startup.


Index: fuse.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/fuse.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** fuse.c	10 Oct 2003 16:36:55 -0000	1.91
--- fuse.c	13 Oct 2003 14:26:52 -0000	1.92
***************
*** 85,88 ****
--- 85,91 ----
  libspectrum_creator *fuse_creator;
  
+ /* The earliest version of libspectrum we need */
+ static const char *LIBSPECTRUM_MIN_VERSION = "0.2.0.1";
+ 
  /* The various types of file we may want to run on startup */
  typedef struct start_files_t {
***************
*** 180,184 ****
    if( display_init(&argc,&argv) ) return 1;
  
!   if( libspectrum_init() ) return 1;
  
  #ifdef HAVE_GETEUID
--- 183,194 ----
    if( display_init(&argc,&argv) ) return 1;
  
!   if( libspectrum_check_version( LIBSPECTRUM_MIN_VERSION ) ) {
!     if( libspectrum_init() ) return 1;
!   } else {
!     ui_error( UI_ERROR_ERROR,
!               "libspectrum version %s found, but %s required",
! 	      libspectrum_version(), LIBSPECTRUM_MIN_VERSION );
!     return 1;
!   }
  
  #ifdef HAVE_GETEUID

[fuse-emulator-cvs] libspectrum/hacking ChangeLog,1.19,1.20

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/libspectrum/hacking
In directory sc8-pr-cvs1:/tmp/cvs-serv21388/hacking

Modified Files:
	ChangeLog 
Log Message:
Add routines to check libspectrum's version.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/libspectrum/hacking/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ChangeLog	9 Oct 2003 21:37:32 -0000	1.19
--- ChangeLog	13 Oct 2003 14:25:43 -0000	1.20
***************
*** 108,109 ****
--- 108,111 ----
  20031009 creator.c, libspectrum.h.in, rzx.c, szx.c: add support for
  	 writing custom data in the creator blocks.
+ 20031013 libspectrum.c, libspectrum.h.in: add routines to check
+ 	 libspectrum's version.

[fuse-emulator-cvs] libspectrum libspectrum.c,1.60,1.61 libspectrum.h.in,1.95,1.96

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/libspectrum
In directory sc8-pr-cvs1:/tmp/cvs-serv21388

Modified Files:
	libspectrum.c libspectrum.h.in 
Log Message:
Add routines to check libspectrum's version.


Index: libspectrum.c
===================================================================
RCS file: /cvsroot/fuse-emulator/libspectrum/libspectrum.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** libspectrum.c	21 Sep 2003 22:29:08 -0000	1.60
--- libspectrum.c	13 Oct 2003 14:25:43 -0000	1.61
***************
*** 80,83 ****
--- 80,115 ----
  }
  
+ int
+ libspectrum_check_version( const char *version )
+ {
+   size_t i;
+ 
+   int libspectrum_version[4] = { 0, 0, 0, 0 },
+       required_version[4]    = { 0, 0, 0, 0 };
+ 
+   sscanf( VERSION, "%d.%d.%d.%d",
+ 	  &libspectrum_version[0], &libspectrum_version[1],
+ 	  &libspectrum_version[2], &libspectrum_version[3] );
+   sscanf( version, "%d.%d.%d.%d",
+ 	  &required_version[0], &required_version[1],
+ 	  &required_version[2], &required_version[3] );
+ 
+   for( i = 0; i < 4; i++ ) {
+     
+     if( libspectrum_version[i] < required_version[i] ) return 0;
+     if( libspectrum_version[i] > required_version[i] ) return 1;
+ 
+   }
+ 
+   /* All version numbers exactly equal, so return OK */
+   return 1;
+ }
+ 
+ const char *
+ libspectrum_version( void )
+ {
+   return VERSION;
+ }
+ 
  libspectrum_error
  libspectrum_print_error( libspectrum_error error, const char *format, ... )

Index: libspectrum.h.in
===================================================================
RCS file: /cvsroot/fuse-emulator/libspectrum/libspectrum.h.in,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** libspectrum.h.in	9 Oct 2003 21:37:31 -0000	1.95
--- libspectrum.h.in	13 Oct 2003 14:25:43 -0000	1.96
***************
*** 75,78 ****
--- 75,83 ----
  libspectrum_error libspectrum_init( void );
  
+ /* Version checking */
+ 
+ int libspectrum_check_version( const char *version );
+ const char *libspectrum_version( void );
+ 
  /* Error handling */
  typedef libspectrum_error

[fuse-emulator-cvs] fuse rzx.c,1.50,1.51

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse
In directory sc8-pr-cvs1:/tmp/cvs-serv28009

Modified Files:
	rzx.c 
Log Message:
Reset rzx_competition_mode when starting a non-competition mode recording.


Index: rzx.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/rzx.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** rzx.c	5 Oct 2003 18:03:58 -0000	1.50
--- rzx.c	12 Oct 2003 18:39:09 -0000	1.51
***************
*** 164,167 ****
--- 164,171 ----
      rzx_competition_mode = 1;
      
+   } else {
+ 
+     rzx_competition_mode = 0;
+ 
    }
      

[fuse-emulator-cvs] fuse/hacking ChangeLog,1.51,1.52

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse/hacking
In directory sc8-pr-cvs1:/tmp/cvs-serv28009/hacking

Modified Files:
	ChangeLog 
Log Message:
Reset rzx_competition_mode when starting a non-competition mode recording.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/hacking/ChangeLog,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** ChangeLog	11 Oct 2003 23:33:49 -0000	1.51
--- ChangeLog	12 Oct 2003 18:39:09 -0000	1.52
***************
*** 271,272 ****
--- 271,274 ----
  	 not off the current directory.
  20031011 Remove the now unused getopt/ directory.
+ 20031012 rzx.c: reset rzx_competition_mode when starting a non-competition
+ 	 mode recording.

[fuse-emulator-cvs] fuse/hacking ChangeLog,1.50,1.51

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse/hacking
In directory sc8-pr-cvs1:/tmp/cvs-serv30154/hacking

Modified Files:
	ChangeLog 
Log Message:
Remove the now unused getopt directory.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/hacking/ChangeLog,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** ChangeLog	11 Oct 2003 22:17:54 -0000	1.50
--- ChangeLog	11 Oct 2003 23:33:49 -0000	1.51
***************
*** 270,271 ****
--- 270,272 ----
  	 in the roms/ or lib/ directory off where the Fuse executable is,
  	 not off the current directory.
+ 20031011 Remove the now unused getopt/ directory.

[fuse-emulator-cvs] fuse/getopt .cvsignore,1.1,NONE getopt1.c,1.1,NONE

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse/getopt
In directory sc8-pr-cvs1:/tmp/cvs-serv30154/getopt

Removed Files:
	.cvsignore getopt1.c 
Log Message:
Remove the now unused getopt directory.


--- .cvsignore DELETED ---

--- getopt1.c DELETED ---

[fuse-emulator-cvs] fuse/hacking ChangeLog,1.49,1.50

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse/hacking
In directory sc8-pr-cvs1:/tmp/cvs-serv19574/hacking

Modified Files:
	ChangeLog 
Log Message:
When looking for ROMs or library files, look in the roms/ or lib/ directory
off where the Fuse executable is, not off the current directory.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/hacking/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** ChangeLog	10 Oct 2003 16:36:56 -0000	1.49
--- ChangeLog	11 Oct 2003 22:17:54 -0000	1.50
***************
*** 267,268 ****
--- 267,271 ----
  	 ZX (etc) printer.
  20031010 fuse.c: On Solaris, uname() returns 1 to indicate success.
+ 20031011 machine.c, utils.c: when looking for ROMs or library files, look
+ 	 in the roms/ or lib/ directory off where the Fuse executable is,
+ 	 not off the current directory.

[fuse-emulator-cvs] fuse machine.c,1.69,1.70 utils.c,1.26,1.27

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse
In directory sc8-pr-cvs1:/tmp/cvs-serv19574

Modified Files:
	machine.c utils.c 
Log Message:
When looking for ROMs or library files, look in the roms/ or lib/ directory
off where the Fuse executable is, not off the current directory.


Index: machine.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/machine.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** machine.c	6 Oct 2003 11:59:26 -0000	1.69
--- machine.c	11 Oct 2003 22:17:54 -0000	1.70
***************
*** 31,34 ****
--- 31,35 ----
  #include <stdio.h>
  #include <fcntl.h>
+ #include <libgen.h>
  #include <settings.h>
  #include <string.h>
***************
*** 401,405 ****
  {
    int fd;
!   char path[ PATHNAME_MAX_LENGTH ];
  
    /* If this is an absolute path, just look there */
--- 402,407 ----
  {
    int fd;
!   char fuse_path[ PATHNAME_MAX_LENGTH], path[ PATHNAME_MAX_LENGTH ];
!   char *fuse_dir;
  
    /* If this is an absolute path, just look there */
***************
*** 410,416 ****
    fd = open( filename, O_RDONLY | O_BINARY ); if( fd != -1 ) return fd;
  
!   /* Then in a 'roms' subdirectory (very useful when Fuse hasn't been
!      installed into /usr/local or wherever) */
!   snprintf( path, PATHNAME_MAX_LENGTH, "roms/%s", filename );
    fd = open( path, O_RDONLY | O_BINARY );
    if( fd != -1 ) return fd;
--- 412,422 ----
    fd = open( filename, O_RDONLY | O_BINARY ); if( fd != -1 ) return fd;
  
!   /* Then in a 'roms' subdirectory off where the Fuse executable is
!      (useful when Fuse hasn't been installed into /usr/local or
!      wherever) */
!   strncpy( fuse_path, fuse_progname, PATHNAME_MAX_LENGTH );
!   fuse_dir = dirname( fuse_path );
! 
!   snprintf( path, PATHNAME_MAX_LENGTH, "%s/roms/%s", fuse_dir, filename );
    fd = open( path, O_RDONLY | O_BINARY );
    if( fd != -1 ) return fd;

Index: utils.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/utils.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** utils.c	8 Oct 2003 15:44:01 -0000	1.26
--- utils.c	11 Oct 2003 22:17:54 -0000	1.27
***************
*** 29,32 ****
--- 29,33 ----
  #include <errno.h>
  #include <fcntl.h>
+ #include <libgen.h>
  #include <stdio.h>
  #include <stdlib.h>
***************
*** 167,180 ****
  }
  
! /* Find a ROM called `filename'; look in the current directory, ./roms
!    and the defined roms directory; returns a fd for the ROM on success,
!    -1 if it couldn't find the ROM */
  int utils_find_lib( const char *filename )
  {
    int fd;
  
!   char path[ PATHNAME_MAX_LENGTH ];
  
!   snprintf( path, PATHNAME_MAX_LENGTH, "lib/%s", filename );
    fd = open( path, O_RDONLY | O_BINARY );
    if( fd != -1 ) return fd;
--- 168,186 ----
  }
  
! /* Find the auxillary file called `filename'; look in the lib
!    directory below where the Fuse executable is and the defined
!    package data directory; returns a fd for the ROM on success, -1 if
!    it couldn't find the ROM */
  int utils_find_lib( const char *filename )
  {
    int fd;
  
!   char fuse_path[ PATHNAME_MAX_LENGTH ], path[ PATHNAME_MAX_LENGTH ];
!   char *fuse_dir;
  
!   strncpy( fuse_path, fuse_progname, PATHNAME_MAX_LENGTH );
!   fuse_dir = dirname( fuse_path );
! 
!   snprintf( path, PATHNAME_MAX_LENGTH, "%s/lib/%s", fuse_dir, filename );
    fd = open( path, O_RDONLY | O_BINARY );
    if( fd != -1 ) return fd;

[fuse-emulator-cvs] fuse-utils/hacking ChangeLog,1.11,1.12

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse-utils/hacking
In directory sc8-pr-cvs1:/tmp/cvs-serv22990/hacking

Modified Files:
	ChangeLog 
Log Message:
On Solaris, uname() returns 1 to indicate success.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse-utils/hacking/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ChangeLog	9 Oct 2003 21:38:49 -0000	1.11
--- ChangeLog	10 Oct 2003 16:38:00 -0000	1.12
***************
*** 49,50 ****
--- 49,51 ----
  20031007 tapeconv.c: remove double-free bug if tape reading fails.
  20031009 utils.c: add information from uname() into creator custom data.
+ 20031010 utils.c: on Solaris, uname() returns 1 to indicate success.

[fuse-emulator-cvs] fuse-utils utils.c,1.3,1.4

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse-utils
In directory sc8-pr-cvs1:/tmp/cvs-serv22990

Modified Files:
	utils.c 
Log Message:
On Solaris, uname() returns 1 to indicate success.


Index: utils.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse-utils/utils.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** utils.c	9 Oct 2003 21:38:49 -0000	1.3
--- utils.c	10 Oct 2003 16:38:00 -0000	1.4
***************
*** 49,53 ****
  
    sys_error = uname( &buf );
!   if( sys_error ) {
      fprintf( stderr, "%s: error getting system information: %s\n", progname,
  	     strerror( errno ) );
--- 49,53 ----
  
    sys_error = uname( &buf );
!   if( sys_error == -1 ) {
      fprintf( stderr, "%s: error getting system information: %s\n", progname,
  	     strerror( errno ) );

[fuse-emulator-cvs] fuse/hacking ChangeLog,1.48,1.49

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse/hacking
In directory sc8-pr-cvs1:/tmp/cvs-serv22852/hacking

Modified Files:
	ChangeLog 
Log Message:
On Solaris, uname() returns 1 to indicate success.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/hacking/ChangeLog,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** ChangeLog	10 Oct 2003 11:03:44 -0000	1.48
--- ChangeLog	10 Oct 2003 16:36:56 -0000	1.49
***************
*** 266,267 ****
--- 266,268 ----
  20031010 printer.c, settings.dat, ui/options.dat: add option to disable
  	 ZX (etc) printer.
+ 20031010 fuse.c: On Solaris, uname() returns 1 to indicate success.

[fuse-emulator-cvs] fuse fuse.c,1.90,1.91

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse
In directory sc8-pr-cvs1:/tmp/cvs-serv22852

Modified Files:
	fuse.c 
Log Message:
On Solaris, uname() returns 1 to indicate success.


Index: fuse.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/fuse.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** fuse.c	9 Oct 2003 21:40:26 -0000	1.90
--- fuse.c	10 Oct 2003 16:36:55 -0000	1.91
***************
*** 248,252 ****
  
    sys_error = uname( &buf );
!   if( sys_error ) {
      ui_error( UI_ERROR_ERROR, "error getting system information: %s",
  	      strerror( errno ) );
--- 248,252 ----
  
    sys_error = uname( &buf );
!   if( sys_error == -1 ) {
      ui_error( UI_ERROR_ERROR, "error getting system information: %s",
  	      strerror( errno ) );

[fuse-emulator-cvs] fuse/ui options.dat,1.19,1.20

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse/ui
In directory sc8-pr-cvs1:/tmp/cvs-serv29447/ui

Modified Files:
	options.dat 
Log Message:
Add option to disable ZX (etc) printer.


Index: options.dat
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/ui/options.dat,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** options.dat	9 Oct 2003 11:16:44 -0000	1.19
--- options.dat	10 Oct 2003 11:03:45 -0000	1.20
***************
*** 12,15 ****
--- 12,16 ----
  Checkbox, (C)olour TV, colour_tv, KEYBOARD_c
  Checkbox, Confirm (d)angerous actions, confirm_dangerous, KEYBOARD_d
+ Checkbox, Emulate (p)rinters, printer, KEYBOARD_p
  
  rzx

[fuse-emulator-cvs] fuse printer.c,1.14,1.15 settings.dat,1.25,1.26

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse
In directory sc8-pr-cvs1:/tmp/cvs-serv29447

Modified Files:
	printer.c settings.dat 
Log Message:
Add option to disable ZX (etc) printer.


Index: printer.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/printer.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** printer.c	11 Jul 2003 11:03:25 -0000	1.14
--- printer.c	10 Oct 2003 11:03:43 -0000	1.15
***************
*** 376,379 ****
--- 376,381 ----
  libspectrum_byte printer_zxp_read(libspectrum_word port GCC_UNUSED)
  {
+ if(!settings_current.printer)
+   return(0xff);
  if(!printer_graphics_enabled)
    return(0xff);
***************
*** 420,423 ****
--- 422,427 ----
  void printer_zxp_write(libspectrum_word port GCC_UNUSED,libspectrum_byte b)
  {
+ if(!settings_current.printer)
+   return;
  if(!zxpspeed)
    {
***************
*** 612,615 ****
--- 616,621 ----
  libspectrum_byte printer_parallel_read(libspectrum_word port GCC_UNUSED)
  {
+ if(!settings_current.printer)
+   return(0xff);
  /* bit 0 = busy. other bits high? */
  
***************
*** 621,624 ****
--- 627,632 ----
  			    libspectrum_byte b)
  {
+ if(!settings_current.printer)
+   return;
  parallel_data=b;
  }

Index: settings.dat
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/settings.dat,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** settings.dat	9 Oct 2003 11:16:44 -0000	1.25
--- settings.dat	10 Oct 2003 11:03:43 -0000	1.26
***************
*** 46,49 ****
--- 46,50 ----
  colour_tv, boolean, 1
  confirm_dangerous, boolean, 1
+ printer, boolean, 0
  
  sound_device, string, NULL, 'd'

[fuse-emulator-cvs] fuse/hacking ChangeLog,1.47,1.48

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse/hacking
In directory sc8-pr-cvs1:/tmp/cvs-serv29447/hacking

Modified Files:
	ChangeLog 
Log Message:
Add option to disable ZX (etc) printer.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/hacking/ChangeLog,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** ChangeLog	9 Oct 2003 22:45:36 -0000	1.47
--- ChangeLog	10 Oct 2003 11:03:44 -0000	1.48
***************
*** 264,265 ****
--- 264,267 ----
  	 joystick code by default. Change BYTE etc in sdljoystick.c to
  	 libspectrum_byte. Add missing ; to configure.in (Darren).
+ 20031010 printer.c, settings.dat, ui/options.dat: add option to disable
+ 	 ZX (etc) printer.

[fuse-emulator-cvs] fuse configure.in,1.120,1.121

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse
In directory sc8-pr-cvs1:/tmp/cvs-serv9680

Modified Files:
	configure.in 
Log Message:
Iif using SDL, use its joystick code by default. Change BYTE etc in
sdljoystick.c to libspectrum_byte. Add missing ; to configure.in (Darren).


Index: configure.in
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/configure.in,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** configure.in	8 Oct 2003 17:15:31 -0000	1.120
--- configure.in	9 Oct 2003 22:45:36 -0000	1.121
***************
*** 299,303 ****
    dnl (svgalib appears to dislike switched joysticks on the parallel port...)
    case "$UI" in
!     svga)
        dnl Libraries such as svgalib provide their own joystick code.
        AC_MSG_CHECKING([whether to use $UI's joystick support])
--- 299,303 ----
    dnl (svgalib appears to dislike switched joysticks on the parallel port...)
    case "$UI" in
!     svga|sdl)
        dnl Libraries such as svgalib provide their own joystick code.
        AC_MSG_CHECKING([whether to use $UI's joystick support])
***************
*** 321,325 ****
      dnl Look for libjsw. If missing, use QAOP<space>.
      AC_CHECK_HEADERS(jsw.h,
!                      LIBS="$LIBS -ljsw" AC_DEFINE(USE_JOYSTICK),
                       AC_MSG_WARN(jsw.h not found - joystick support disabled))
    fi
--- 321,325 ----
      dnl Look for libjsw. If missing, use QAOP<space>.
      AC_CHECK_HEADERS(jsw.h,
!                      LIBS="$LIBS -ljsw"; AC_DEFINE(USE_JOYSTICK),
                       AC_MSG_WARN(jsw.h not found - joystick support disabled))
    fi

[fuse-emulator-cvs] fuse/ui/sdl sdljoystick.c,1.1,1.2

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse/ui/sdl
In directory sc8-pr-cvs1:/tmp/cvs-serv9680/ui/sdl

Modified Files:
	sdljoystick.c 
Log Message:
Iif using SDL, use its joystick code by default. Change BYTE etc in
sdljoystick.c to libspectrum_byte. Add missing ; to configure.in (Darren).


Index: sdljoystick.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/ui/sdl/sdljoystick.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sdljoystick.c	7 Oct 2003 13:49:01 -0000	1.1
--- sdljoystick.c	9 Oct 2003 22:45:36 -0000	1.2
***************
*** 92,97 ****
  }
  
! BYTE
! ui_joystick_read( WORD port, BYTE which )
  {
    if( which ) return joystick2_return_value.byte;
--- 92,97 ----
  }
  
! libspectrum_byte
! ui_joystick_read( libspectrum_word port, libspectrum_byte which )
  {
    if( which ) return joystick2_return_value.byte;