security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

* photoid.c (show_photos): Use the long keyid as the filename for the

Browse source 
photo.  Use the short keyid as the filename on 8.3 systems.

* exec.h, exec.c (make_tempdir, exec_write, exec_finish): Allow caller to
specify filename.  This should make things easier on windows and macs
where the file extension is required, but a whole filename is even better.

* keyedit.c (show_key_with_all_names, show_prefs): Show proper prefs for a
v4 key uid with no selfsig at all.

* misc.c (check_permissions): Don't check permissions on non-normal files
(pipes, character devices, etc.)
This commit is contained in:
David Shaw 2002-05-13 20:44:30 +00:00
parent 0a66b9aaae
commit 435ecaa5b0
6 changed files with 73 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

28
g10/exec.c
View file

@ -61,10 +61,10 @@ char *mkdtemp(char *template);
/* Makes a temp directory and filenames */
static int make_tempdir(struct exec_info *info)
{
char *tmp=opt.temp_dir,*ext=info->ext;
char *tmp=opt.temp_dir,*name=info->name;
if(!ext)
ext=info->binary?"bin":"txt";
if(!name)
name=info->binary?"tempfile.bin":"tempfile.txt";
/* Make up the temp dir and files in case we need them */
@ -118,17 +118,15 @@ static int make_tempdir(struct exec_info *info)
{
info->madedir=1;
info->tempfile_in=m_alloc(strlen(info->tempdir)+strlen(DIRSEP_S)+6+
strlen(EXTSEP_S)+strlen(ext)+1);
sprintf(info->tempfile_in,"%s" DIRSEP_S "datain" EXTSEP_S "%s",
info->tempdir,ext);
info->tempfile_in=m_alloc(strlen(info->tempdir)+
strlen(DIRSEP_S)+strlen(name)+1);
sprintf(info->tempfile_in,"%s" DIRSEP_S "%s",info->tempdir,name);
if(!info->writeonly)
{
info->tempfile_out=m_alloc(strlen(info->tempdir)+strlen(DIRSEP_S)+7+
strlen(EXTSEP_S)+strlen(ext)+1);
sprintf(info->tempfile_out,"%s" DIRSEP_S "dataout" EXTSEP_S "%s",
info->tempdir,ext);
info->tempfile_out=m_alloc(strlen(info->tempdir)+
strlen(DIRSEP_S)+strlen(name)+1);
sprintf(info->tempfile_out,"%s" DIRSEP_S "%s",info->tempdir,name);
}
}
@ -239,7 +237,7 @@ static int expand_args(struct exec_info *info,const char *args_in)
shell -c. If there are tempfiles, then it's a system. */
int exec_write(struct exec_info **info,const char *program,
const char *args_in,const char *ext,int writeonly,int binary)
const char *args_in,const char *name,int writeonly,int binary)
{
int ret=G10ERR_GENERAL;
@ -263,8 +261,8 @@ int exec_write(struct exec_info **info,const char *program,
*info=m_alloc_clear(sizeof(struct exec_info));
if(ext)
(*info)->ext=m_strdup(ext);
if(name)
(*info)->name=m_strdup(name);
(*info)->binary=binary;
(*info)->writeonly=writeonly;
@ -508,7 +506,7 @@ int exec_finish(struct exec_info *info)
}
m_free(info->command);
m_free(info->ext);
m_free(info->name);
m_free(info->tempdir);
m_free(info->tempfile_in);
m_free(info->tempfile_out);