security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-23 10:29:58 +01:00
Code Activity

* g10.c: New options --[no-]mangle-dos-filenames.

Browse Source 
* options.h (opt): Added mangle-dos-filenames.
* openfile.c (open_outfile) [USE_ONLY_8DOT3]: Truncate the
filename only when this option is set; this is the default.

NOT YET TESTED!
This commit is contained in:
Werner Koch 2002-12-05 15:21:17 +00:00
parent 1ae9261ef6
commit 9a34b607ab
4 changed files with 101 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
g10/ChangeLog
View File

@ -1,3 +1,10 @@
2002-12-05 Werner Koch <wk@gnupg.org>
* g10.c: New options --[no-]mangle-dos-filenames.
* options.h (opt): Added mangle-dos-filenames.
* openfile.c (open_outfile) [USE_ONLY_8DOT3]: Truncate the
filename only when this option is set; this is the default.
2002-12-04 David Shaw <dshaw@jabberwocky.com>
* main.h, keyedit.c, keygen.c: Back out previous (2002-12-01)

29
g10/g10.c
View File

@ -149,13 +149,9 @@ enum cmd_and_opt_values { aNull = 0,
oDebug,
oDebugAll,
oStatusFD,
#ifdef __riscos__
oStatusFile,
#endif /* __riscos__ */
oStatusFile, /* only used with risc os */
oAttributeFD,
#ifdef __riscos__
oAttributeFile,
#endif /* __riscos__ */
oAttributeFile, /* only used with risc os */
oSKComments,
oNoSKComments,
oNoVersion,
@ -179,13 +175,9 @@ enum cmd_and_opt_values { aNull = 0,
oCertDigestAlgo,
oCompressAlgo,
oPasswdFD,
#ifdef __riscos__
oPasswdFile,
#endif /* __riscos__ */
oPasswdFile, /* only used with risc os */
oCommandFD,
#ifdef __riscos__
oCommandFile,
#endif /* __riscos__ */
oCommandFile, /* only used with risc os */
oQuickRandom,
oNoVerbose,
oTrustDBName,
@ -251,9 +243,7 @@ enum cmd_and_opt_values { aNull = 0,
oEncryptTo,
oNoEncryptTo,
oLoggerFD,
#ifdef __riscos__
oLoggerFile,
#endif /* __riscos__ */
oLoggerFile, /* only used with risc os */
oUtf8Strings,
oNoUtf8Strings,
oDisableCipherAlgo,
@ -304,6 +294,8 @@ enum cmd_and_opt_values { aNull = 0,
oGroup,
oStrict,
oNoStrict,
oMangleDosFilenames,
oNoMangleDosFilenames,
aTest };
@ -597,6 +589,8 @@ static ARGPARSE_OPTS opts[] = {
{ oGroup, "group", 2, "@" },
{ oStrict, "strict", 0, "@" },
{ oNoStrict, "no-strict", 0, "@" },
{ oMangleDosFilenames, "mangle-dos-filenames", 0, "@" },
{ oNoMangleDosFilenames, "no-mangle-dos-filenames", 0, "@" },
{0} };
@ -1112,6 +1106,7 @@ main( int argc, char **argv )
EXPORT_INCLUDE_NON_RFC|EXPORT_INCLUDE_ATTRIBUTES;
opt.keyserver_options.include_subkeys=1;
opt.keyserver_options.include_revoked=1;
opt.mangle_dos_filenames = 1;
#if defined (__MINGW32__)
set_homedir ( read_w32_registry_string( NULL,
"Software\\GNU\\GnuPG", "HomeDir" ));
@ -1685,6 +1680,10 @@ main( int argc, char **argv )
case oGroup: add_group(pargs.r.ret_str); break;
case oStrict: /* noop */ break;
case oNoStrict: /* noop */ break;
case oMangleDosFilenames: opt.mangle_dos_filenames = 1; break;
case oNoMangleDosFilenames: opt.mangle_dos_filenames = 0; break;
default : pargs.err = configfp? 1:2; break;
}
}

35
g10/openfile.c
View File

@ -184,7 +184,7 @@ open_outfile( const char *iname, int mode, IOBUF *a )
log_info(_("writing to stdout\n"));
}
else {
char *buf=NULL;
char *buf = NULL;
const char *name;
if( opt.dry_run )
@ -192,7 +192,9 @@ open_outfile( const char *iname, int mode, IOBUF *a )
else if( opt.outfile )
name = opt.outfile;
else {
#ifdef USE_ONLY_8DOT3
#ifdef USE_ONLY_8DOT3
if (opt.mangle_dos_filenames)
{
/* It is quite common DOS system to have only one dot in a
* a filename So if we have something like this, we simple
* replace the suffix execpt in cases where the suffix is
@ -207,26 +209,32 @@ open_outfile( const char *iname, int mode, IOBUF *a )
buf = m_alloc(strlen(iname)+4+1);
strcpy(buf,iname);
dot = strchr(buf, '.' );
if( dot && dot > buf && dot[1] && strlen(dot) <= 4
&& CMP_FILENAME(newsfx, dot) ) {
if ( dot && dot > buf && dot[1] && strlen(dot) <= 4
&& CMP_FILENAME(newsfx, dot) )
{
strcpy(dot, newsfx );
}
else if( dot && !dot[1] ) /* don't duplicate a dot */
else if ( dot && !dot[1] ) /* don't duplicate a dot */
strcpy( dot, newsfx+1 );
else
strcat( buf, newsfx );
#else
strcat ( buf, newsfx );
}
if (!buf)
#endif /* USE_ONLY_8DOT3 */
{
buf = m_alloc(strlen(iname)+4+1);
strcpy(stpcpy(buf,iname), mode==1 ? EXTSEP_S "asc" :
mode==2 ? EXTSEP_S "sig" : EXTSEP_S "gpg");
#endif
}
name = buf;
}
rc = 0;
while( !overwrite_filep (name) ) {
while( !overwrite_filep (name) )
{
char *tmp = ask_outfile_name (NULL, 0);
if ( !tmp || !*tmp ) {
if ( !tmp || !*tmp )
{
m_free (tmp);
rc = G10ERR_FILE_EXISTS;
break;
@ -235,8 +243,10 @@ open_outfile( const char *iname, int mode, IOBUF *a )
name = buf = tmp;
}
if( !rc ) {
if( !(*a = iobuf_create( name )) ) {
if( !rc )
{
if( !(*a = iobuf_create( name )) )
{
log_error(_("%s: can't create: %s\n"), name, strerror(errno) );
rc = G10ERR_CREATE_FILE;
}
@ -245,6 +255,7 @@ open_outfile( const char *iname, int mode, IOBUF *a )
}
m_free(buf);
}
return rc;
}

1
g10/options.h
View File

@ -178,6 +178,7 @@ struct {
int no_homedir_creation;
int show_keyring;
struct groupitem *grouplist;
int mangle_dos_filenames;
} opt;