[fuse-emulator-cvs] fuse settings.pl,1.54,1.55 utils.c,1.31,1.32 utils.h,1.9,1.10

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

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

Modified Files:
	settings.pl utils.c utils.h 
Log Message:
Add and use utils_get_home_path function.


Index: settings.pl
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/settings.pl,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** settings.pl	8 Oct 2003 14:53:06 -0000	1.54
--- settings.pl	29 Oct 2003 16:24:26 -0000	1.55
***************
*** 94,97 ****
--- 94,98 ----
  #include "spectrum.h"
  #include "ui/ui.h"
+ #include "utils.h"
  
  /* The name of our configuration file */
***************
*** 170,176 ****
  #endif			/* #ifdef HAVE_LIBZ */
  
-   if( !settings->start_machine ) return 1;
-   if( !settings->start_scaler_mode ) return 1;
- 
    return 0;
  }
--- 171,174 ----
***************
*** 188,196 ****
    xmlDocPtr doc;
  
!   home = getenv( "HOME" );
!   if( !home ) {
!     ui_error( UI_ERROR_ERROR, "couldn't get your home directory" );
!     return 1;
!   }
  
    snprintf( path, 256, "%s/%s", home, CONFIG_FILE_NAME );
--- 186,190 ----
    xmlDocPtr doc;
  
!   home = utils_get_home_path(); if( !home ) return 1;
  
    snprintf( path, 256, "%s/%s", home, CONFIG_FILE_NAME );
***************
*** 293,301 ****
    xmlDocPtr doc; xmlNodePtr root;
  
!   home = getenv( "HOME" );
!   if( !home ) {
!     ui_error( UI_ERROR_ERROR, "couldn't get your home directory" );
!     return 1;
!   }
  
    snprintf( path, 256, "%s/%s", home, CONFIG_FILE_NAME );
--- 287,291 ----
    xmlDocPtr doc; xmlNodePtr root;
  
!   home = utils_get_home_path(); if( !home ) return 1;
  
    snprintf( path, 256, "%s/%s", home, CONFIG_FILE_NAME );

Index: utils.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/utils.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** utils.c	29 Oct 2003 15:38:03 -0000	1.31
--- utils.c	29 Oct 2003 16:24:26 -0000	1.32
***************
*** 357,358 ****
--- 357,379 ----
    
  }
+ 
+ /* Return the path where we will store our configuration information etc */
+ const char*
+ utils_get_home_path( void )
+ {
+   const char *dir;
+ 
+ #ifdef WIN32
+ 
+   dir = getenv( "USERPROFILE" ); if( dir ) return dir;
+   dir = getenv( "WINDIR" ); if( dir ) return dir;
+ 
+ #else				/* #ifdef WIN32 */
+ 
+   dir = getenv( "HOME" ); if( dir ) return dir;
+ 
+ #endif				/* #ifdef WIN32 */
+ 
+   ui_error( UI_ERROR_ERROR, "couldn't find a plausible home directory" );
+   return NULL;
+ }

Index: utils.h
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/utils.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** utils.h	23 Jun 2003 11:08:53 -0000	1.9
--- utils.h	29 Oct 2003 16:24:26 -0000	1.10
***************
*** 57,60 ****
--- 57,61 ----
  		      size_t length );
  const char* utils_get_temp_path( void );
+ const char* utils_get_home_path( void );
  
  #endif			/* #ifndef FUSE_UTILS_H */