diff -ur nautilus.17b-orig/cli.c nautilus.17b/cli.c --- nautilus.17b-orig/cli.c Mon Jan 18 07:42:31 1999 +++ nautilus.17b/cli.c Mon May 15 16:22:32 2000 @@ -39,6 +39,7 @@ #include #include #ifdef linux +#include /* man 2 stat #include /* for memory lock */ #include /* for memory lock */ #endif @@ -57,6 +58,9 @@ extern char *optarg; extern int optind; + +#define CONFIGFILENAMLEN 256 + void main(int argc, char *argv[]) { @@ -65,6 +69,7 @@ char connected; char vsound = TRUE; char *fname; + char fname1[CONFIGFILENAMLEN]; char *pw; char pw1[MAX_SKEY_LEN+1]; char pw2[MAX_SKEY_LEN+1]; @@ -93,9 +98,28 @@ } /* read configuration file */ - if ((fname = getenv("NAUTILUS_CONFIG_FILE")) != NULL) - if (ReadConfigFile(fname) == FAIL) + + if ((fname = getenv("NAUTILUS_CONFIG_FILE")) != NULL) { + + if (ReadConfigFile(fname) == FAIL) + exit(1); + +#if defined(unix) /* try home directory */ + + + } else { + + struct stat BUF; + + strncpy(fname1,getenv("HOME"),CONFIGFILENAMLEN); + strcat (fname1,"/.nautilus.cfg"); + if (stat(fname1, &BUF) == 0){ /* stat succes, File exists */ + if (ReadConfigFile(fname1) == FAIL) exit(1); + } + +#endif + } /* parse arguments */ #if defined(unix)