1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-06 23:17:47 +02:00

use of EXTSEP_S

This commit is contained in:
Stefan Bellon 2002-08-06 18:32:58 +00:00
parent 63a71c1ff9
commit 7dec3219c9
3 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2002-08-06 Stefan Bellon <sbellon@sbellon.de>
* g10.c (main): Use of EXTSEP_S in new gpg.conf string.
* openfile.c (copy_options_file): Ditto.
2002-08-06 David Shaw <dshaw@jabberwocky.com> 2002-08-06 David Shaw <dshaw@jabberwocky.com>
* options.h, g10.c (main), mainproc.c (proc_encrypted): * options.h, g10.c (main), mainproc.c (proc_encrypted):

View File

@ -982,7 +982,7 @@ main( int argc, char **argv )
if( default_config ) if( default_config )
{ {
configname = make_filename(opt.homedir, "gpg.conf", NULL ); configname = make_filename(opt.homedir, "gpg" EXTSEP_S "conf", NULL );
if (!access (configname, R_OK)) if (!access (configname, R_OK))
{ /* Print a warning when both config files are present. */ { /* Print a warning when both config files are present. */
char *p = make_filename(opt.homedir, "options", NULL ); char *p = make_filename(opt.homedir, "options", NULL );

View File

@ -301,7 +301,7 @@ copy_options_file( const char *destdir )
m_free(fname); m_free(fname);
return; return;
} }
strcpy(stpcpy(fname, destdir), DIRSEP_S "gpg.conf" ); strcpy(stpcpy(fname, destdir), DIRSEP_S "gpg" EXTSEP_S "conf" );
dst = fopen( fname, "w" ); dst = fopen( fname, "w" );
if( !dst ) { if( !dst ) {
log_error(_("%s: can't create: %s\n"), fname, strerror(errno) ); log_error(_("%s: can't create: %s\n"), fname, strerror(errno) );