2003-06-05 07:14:21 +00:00
|
|
|
/* photoid.c - photo ID handling code
|
2011-12-15 16:46:28 -05:00
|
|
|
* Copyright (C) 2001, 2002, 2005, 2006, 2008, 2011 Free Software Foundation, Inc.
|
2003-06-05 07:14:21 +00:00
|
|
|
*
|
|
|
|
* This file is part of GnuPG.
|
|
|
|
*
|
|
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
2007-07-04 19:49:40 +00:00
|
|
|
* the Free Software Foundation; either version 3 of the License, or
|
2003-06-05 07:14:21 +00:00
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* GnuPG is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2016-11-05 12:02:19 +01:00
|
|
|
* along with this program; if not, see <https://www.gnu.org/licenses/>.
|
2003-06-05 07:14:21 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
2019-07-25 11:21:58 +09:00
|
|
|
#include <unistd.h>
|
2011-02-04 12:57:53 +01:00
|
|
|
#ifdef _WIN32
|
2014-03-07 09:46:44 +01:00
|
|
|
# ifdef HAVE_WINSOCK2_H
|
|
|
|
# include <winsock2.h>
|
|
|
|
# endif
|
2003-06-05 07:14:21 +00:00
|
|
|
# include <windows.h>
|
|
|
|
#endif
|
2006-04-19 11:26:11 +00:00
|
|
|
|
|
|
|
#include "gpg.h"
|
2017-03-07 20:21:23 +09:00
|
|
|
#include "../common/util.h"
|
2003-06-05 07:14:21 +00:00
|
|
|
#include "packet.h"
|
2017-03-07 20:21:23 +09:00
|
|
|
#include "../common/status.h"
|
2003-06-05 07:14:21 +00:00
|
|
|
#include "keydb.h"
|
2017-03-07 20:21:23 +09:00
|
|
|
#include "../common/i18n.h"
|
|
|
|
#include "../common/iobuf.h"
|
2003-06-05 07:14:21 +00:00
|
|
|
#include "options.h"
|
|
|
|
#include "main.h"
|
|
|
|
#include "photoid.h"
|
2017-03-07 20:21:23 +09:00
|
|
|
#include "../common/ttyio.h"
|
2008-10-03 20:00:46 +00:00
|
|
|
#include "trustdb.h"
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2022-11-09 10:37:58 +09:00
|
|
|
#if defined (_WIN32)
|
|
|
|
/* This is a nicer system() for windows that waits for programs to
|
|
|
|
return before returning control to the caller. I hate helpful
|
|
|
|
computers. */
|
|
|
|
static int
|
|
|
|
w32_system (const char *command)
|
|
|
|
{
|
|
|
|
if (!strncmp (command, "!ShellExecute ", 14))
|
|
|
|
{
|
|
|
|
SHELLEXECUTEINFOW see;
|
|
|
|
wchar_t *wname;
|
|
|
|
int waitms;
|
|
|
|
|
|
|
|
command = command + 14;
|
|
|
|
while (spacep (command))
|
|
|
|
command++;
|
|
|
|
waitms = atoi (command);
|
|
|
|
if (waitms < 0)
|
|
|
|
waitms = 0;
|
|
|
|
else if (waitms > 60*1000)
|
|
|
|
waitms = 60000;
|
|
|
|
while (*command && !spacep (command))
|
|
|
|
command++;
|
|
|
|
while (spacep (command))
|
|
|
|
command++;
|
|
|
|
|
|
|
|
wname = utf8_to_wchar (command);
|
|
|
|
if (!wname)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
memset (&see, 0, sizeof see);
|
|
|
|
see.cbSize = sizeof see;
|
|
|
|
see.fMask = (SEE_MASK_NOCLOSEPROCESS
|
|
|
|
| SEE_MASK_NOASYNC
|
|
|
|
| SEE_MASK_FLAG_NO_UI
|
|
|
|
| SEE_MASK_NO_CONSOLE);
|
|
|
|
see.lpVerb = L"open";
|
|
|
|
see.lpFile = (LPCWSTR)wname;
|
|
|
|
see.nShow = SW_SHOW;
|
|
|
|
|
|
|
|
if (DBG_EXTPROG)
|
|
|
|
log_debug ("running ShellExecuteEx(open,'%s')\n", command);
|
|
|
|
if (!ShellExecuteExW (&see))
|
|
|
|
{
|
|
|
|
if (DBG_EXTPROG)
|
|
|
|
log_debug ("ShellExecuteEx failed: rc=%d\n", (int)GetLastError ());
|
|
|
|
xfree (wname);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (DBG_EXTPROG)
|
2023-06-26 10:59:35 +09:00
|
|
|
{
|
|
|
|
/* hInstApp has HINSTANCE type. The documentations says
|
|
|
|
that it's not a true HINSTANCE and it can be cast only to
|
|
|
|
an int. */
|
|
|
|
int hinstance = (intptr_t)see.hInstApp;
|
|
|
|
|
|
|
|
log_debug ("ShellExecuteEx succeeded (hProcess=%p,hInstApp=%d)\n",
|
|
|
|
see.hProcess, hinstance);
|
|
|
|
}
|
2022-11-09 10:37:58 +09:00
|
|
|
|
|
|
|
if (!see.hProcess)
|
|
|
|
{
|
|
|
|
gnupg_usleep (waitms*1000);
|
|
|
|
if (DBG_EXTPROG)
|
|
|
|
log_debug ("ShellExecuteEx ready (wait=%dms)\n", waitms);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
WaitForSingleObject (see.hProcess, INFINITE);
|
|
|
|
if (DBG_EXTPROG)
|
|
|
|
log_debug ("ShellExecuteEx ready\n");
|
|
|
|
}
|
|
|
|
CloseHandle (see.hProcess);
|
|
|
|
|
|
|
|
xfree (wname);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
char *string;
|
|
|
|
wchar_t *wstring;
|
|
|
|
PROCESS_INFORMATION pi;
|
|
|
|
STARTUPINFOW si;
|
|
|
|
|
|
|
|
/* We must use a copy of the command as CreateProcess modifies
|
|
|
|
* this argument. */
|
|
|
|
string = xstrdup (command);
|
|
|
|
wstring = utf8_to_wchar (string);
|
|
|
|
xfree (string);
|
|
|
|
if (!wstring)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
memset (&pi, 0, sizeof(pi));
|
|
|
|
memset (&si, 0, sizeof(si));
|
|
|
|
si.cb = sizeof (si);
|
|
|
|
|
|
|
|
if (!CreateProcessW (NULL, wstring, NULL, NULL, FALSE,
|
|
|
|
DETACHED_PROCESS,
|
|
|
|
NULL, NULL, &si, &pi))
|
|
|
|
{
|
|
|
|
xfree (wstring);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Wait for the child to exit */
|
|
|
|
WaitForSingleObject (pi.hProcess, INFINITE);
|
|
|
|
|
|
|
|
CloseHandle (pi.hProcess);
|
|
|
|
CloseHandle (pi.hThread);
|
|
|
|
xfree (wstring);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif /*_W32*/
|
|
|
|
|
2009-09-03 20:51:55 +00:00
|
|
|
/* Generate a new photo id packet, or return NULL if canceled.
|
|
|
|
FIXME: Should we add a duplicates check similar to generate_user_id? */
|
2006-04-19 11:26:11 +00:00
|
|
|
PKT_user_id *
|
2016-05-21 11:41:49 +02:00
|
|
|
generate_photo_id (ctrl_t ctrl, PKT_public_key *pk,const char *photo_name)
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
|
|
|
PKT_user_id *uid;
|
|
|
|
int error=1,i;
|
2023-06-13 10:07:07 +02:00
|
|
|
uint64_t len;
|
2006-04-19 11:26:11 +00:00
|
|
|
char *filename;
|
2003-06-05 07:14:21 +00:00
|
|
|
byte *photo=NULL;
|
|
|
|
byte header[16];
|
2006-04-19 11:26:11 +00:00
|
|
|
IOBUF file;
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
header[0]=0x10; /* little side of photo header length */
|
|
|
|
header[1]=0; /* big side of photo header length */
|
|
|
|
header[2]=1; /* 1 == version of photo header */
|
|
|
|
header[3]=1; /* 1 == JPEG */
|
|
|
|
|
|
|
|
for(i=4;i<16;i++) /* The reserved bytes */
|
|
|
|
header[i]=0;
|
|
|
|
|
|
|
|
#define EXTRA_UID_NAME_SPACE 71
|
2006-04-19 11:26:11 +00:00
|
|
|
uid=xmalloc_clear(sizeof(*uid)+71);
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
if(photo_name && *photo_name)
|
|
|
|
filename=make_filename(photo_name,(void *)NULL);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
tty_printf(_("\nPick an image to use for your photo ID."
|
|
|
|
" The image must be a JPEG file.\n"
|
|
|
|
"Remember that the image is stored within your public key."
|
|
|
|
" If you use a\n"
|
|
|
|
"very large picture, your key will become very large"
|
|
|
|
" as well!\n"
|
|
|
|
"Keeping the image close to 240x288 is a good size"
|
|
|
|
" to use.\n"));
|
|
|
|
filename=NULL;
|
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
while(photo==NULL)
|
|
|
|
{
|
2006-04-19 11:26:11 +00:00
|
|
|
if(filename==NULL)
|
|
|
|
{
|
|
|
|
char *tempname;
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
tty_printf("\n");
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
tty_enable_completion(NULL);
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
tempname=cpr_get("photoid.jpeg.add",
|
|
|
|
_("Enter JPEG filename for photo ID: "));
|
|
|
|
|
|
|
|
tty_disable_completion();
|
|
|
|
|
|
|
|
filename=make_filename(tempname,(void *)NULL);
|
|
|
|
|
|
|
|
xfree(tempname);
|
|
|
|
|
|
|
|
if(strlen(filename)==0)
|
|
|
|
goto scram;
|
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
file=iobuf_open(filename);
|
2006-04-19 11:26:11 +00:00
|
|
|
if (file && is_secured_file (iobuf_get_fd (file)))
|
|
|
|
{
|
|
|
|
iobuf_close (file);
|
|
|
|
file = NULL;
|
2010-04-01 13:24:55 +00:00
|
|
|
gpg_err_set_errno (EPERM);
|
2006-04-19 11:26:11 +00:00
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
if(!file)
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
log_error(_("unable to open JPEG file '%s': %s\n"),
|
2003-06-05 07:14:21 +00:00
|
|
|
filename,strerror(errno));
|
2006-04-19 11:26:11 +00:00
|
|
|
xfree(filename);
|
|
|
|
filename=NULL;
|
2003-06-05 07:14:21 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2023-06-13 10:07:07 +02:00
|
|
|
len = iobuf_get_filelength(file);
|
|
|
|
if(len>6144)
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
2023-06-13 10:07:07 +02:00
|
|
|
/* We silently skip JPEGs larger than 1MiB because we have a
|
|
|
|
* 2MiB limit on the user ID packets and we need some limit
|
|
|
|
* anyway because the returned u64 is larger than the u32 or
|
|
|
|
* OpenPGP. Note that the diagnostic may print a wrong
|
|
|
|
* value if the value is really large; we don't fix this to
|
|
|
|
* avoid a string change. */
|
|
|
|
tty_printf( _("This JPEG is really large (%d bytes) !\n"), (int)len);
|
|
|
|
if(len > 1024*1024
|
|
|
|
|| !cpr_get_answer_is_yes("photoid.jpeg.size",
|
2006-04-19 11:26:11 +00:00
|
|
|
_("Are you sure you want to use it? (y/N) ")))
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
|
|
|
iobuf_close(file);
|
2006-04-19 11:26:11 +00:00
|
|
|
xfree(filename);
|
|
|
|
filename=NULL;
|
2003-06-05 07:14:21 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-04-19 11:26:11 +00:00
|
|
|
photo=xmalloc(len);
|
2003-06-05 07:14:21 +00:00
|
|
|
iobuf_read(file,photo,len);
|
|
|
|
iobuf_close(file);
|
|
|
|
|
|
|
|
/* Is it a JPEG? */
|
2011-12-15 16:46:28 -05:00
|
|
|
if(photo[0]!=0xFF || photo[1]!=0xD8)
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
log_error(_("'%s' is not a JPEG file\n"),filename);
|
2006-04-19 11:26:11 +00:00
|
|
|
xfree(photo);
|
2003-06-05 07:14:21 +00:00
|
|
|
photo=NULL;
|
2006-04-19 11:26:11 +00:00
|
|
|
xfree(filename);
|
|
|
|
filename=NULL;
|
2003-06-05 07:14:21 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Build the packet */
|
|
|
|
build_attribute_subpkt(uid,1,photo,len,header,16);
|
|
|
|
parse_attribute_subpkts(uid);
|
|
|
|
make_attribute_uidname(uid, EXTRA_UID_NAME_SPACE);
|
|
|
|
|
|
|
|
/* Showing the photo is not safe when noninteractive since the
|
|
|
|
"user" may not be able to dismiss a viewer window! */
|
|
|
|
if(opt.command_fd==-1)
|
|
|
|
{
|
2016-05-21 11:41:49 +02:00
|
|
|
show_photos (ctrl, uid->attribs, uid->numattribs, pk, uid);
|
2003-06-05 07:14:21 +00:00
|
|
|
switch(cpr_get_answer_yes_no_quit("photoid.jpeg.okay",
|
|
|
|
_("Is this photo correct (y/N/q)? ")))
|
|
|
|
{
|
|
|
|
case -1:
|
|
|
|
goto scram;
|
|
|
|
case 0:
|
|
|
|
free_attributes(uid);
|
2006-04-19 11:26:11 +00:00
|
|
|
xfree(photo);
|
2003-06-05 07:14:21 +00:00
|
|
|
photo=NULL;
|
2006-04-19 11:26:11 +00:00
|
|
|
xfree(filename);
|
|
|
|
filename=NULL;
|
2003-06-05 07:14:21 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
error=0;
|
|
|
|
uid->ref=1;
|
|
|
|
|
|
|
|
scram:
|
2006-04-19 11:26:11 +00:00
|
|
|
xfree(filename);
|
|
|
|
xfree(photo);
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
if(error)
|
|
|
|
{
|
|
|
|
free_attributes(uid);
|
2006-04-19 11:26:11 +00:00
|
|
|
xfree(uid);
|
2003-06-05 07:14:21 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return uid;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Returns 0 for error, 1 for valid */
|
|
|
|
int parse_image_header(const struct user_attribute *attr,byte *type,u32 *len)
|
|
|
|
{
|
|
|
|
u16 headerlen;
|
|
|
|
|
|
|
|
if(attr->len<3)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* For historical reasons (i.e. "oops!"), the header length is
|
|
|
|
little endian. */
|
|
|
|
headerlen=(attr->data[1]<<8) | attr->data[0];
|
|
|
|
|
|
|
|
if(headerlen>attr->len)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if(type && attr->len>=4)
|
|
|
|
{
|
|
|
|
if(attr->data[2]==1) /* header version 1 */
|
|
|
|
*type=attr->data[3];
|
|
|
|
else
|
|
|
|
*type=0;
|
|
|
|
}
|
|
|
|
|
|
|
|
*len=attr->len-headerlen;
|
|
|
|
|
|
|
|
if(*len==0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* style==0 for extension, 1 for name, 2 for MIME type. Remember that
|
|
|
|
the "name" style string could be used in a user ID name field, so
|
|
|
|
make sure it is not too big (see parse-packet.c:parse_attribute).
|
|
|
|
Extensions should be 3 characters long for the best cross-platform
|
|
|
|
compatibility. */
|
2019-07-23 12:04:21 +09:00
|
|
|
const char *
|
|
|
|
image_type_to_string(byte type,int style)
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
2019-07-23 12:04:21 +09:00
|
|
|
const char *string;
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
switch(type)
|
|
|
|
{
|
|
|
|
case 1: /* jpeg */
|
|
|
|
if(style==0)
|
|
|
|
string="jpg";
|
|
|
|
else if(style==1)
|
|
|
|
string="jpeg";
|
|
|
|
else
|
|
|
|
string="image/jpeg";
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
if(style==0)
|
|
|
|
string="bin";
|
|
|
|
else if(style==1)
|
|
|
|
string="unknown";
|
|
|
|
else
|
|
|
|
string="image/x-unknown";
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return string;
|
|
|
|
}
|
|
|
|
|
|
|
|
#if !defined(FIXED_PHOTO_VIEWER) && !defined(DISABLE_PHOTO_VIEWER)
|
2019-05-17 12:31:11 +02:00
|
|
|
static const char *
|
|
|
|
get_default_photo_command(void)
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
2003-09-23 17:48:33 +00:00
|
|
|
#if defined(_WIN32)
|
2023-05-16 10:16:31 +09:00
|
|
|
return "!ShellExecute 400 %i";
|
2003-06-05 07:14:21 +00:00
|
|
|
#elif defined(__APPLE__)
|
|
|
|
/* OS X. This really needs more than just __APPLE__. */
|
|
|
|
return "open %I";
|
|
|
|
#else
|
2019-05-17 12:31:11 +02:00
|
|
|
if (!path_access ("xloadimage", X_OK))
|
|
|
|
return "xloadimage -fork -quiet -title 'KeyID 0x%k' stdin";
|
|
|
|
else if (!path_access ("display",X_OK))
|
|
|
|
return "display -title 'KeyID 0x%k' %i";
|
|
|
|
else if (getuid () && !path_access ("xdg-open", X_OK))
|
2021-02-28 14:34:10 +01:00
|
|
|
{
|
|
|
|
/* xdg-open spawns the actual program and exits so we need to
|
|
|
|
* keep the temp file */
|
|
|
|
return "xdg-open %I";
|
|
|
|
}
|
2019-05-17 12:31:11 +02:00
|
|
|
else
|
|
|
|
return "/bin/true";
|
2003-06-05 07:14:21 +00:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2019-07-25 11:21:58 +09:00
|
|
|
#ifndef DISABLE_PHOTO_VIEWER
|
2019-07-25 11:41:37 +09:00
|
|
|
struct spawn_info
|
2019-07-25 11:21:58 +09:00
|
|
|
{
|
2019-07-25 11:41:37 +09:00
|
|
|
unsigned int keep_temp_file;
|
|
|
|
char *command;
|
|
|
|
char *tempdir;
|
|
|
|
char *tempfile;
|
2019-07-25 11:21:58 +09:00
|
|
|
};
|
|
|
|
|
|
|
|
#ifdef NO_EXEC
|
2019-07-25 11:41:37 +09:00
|
|
|
static void
|
|
|
|
show_photo (const char *command, const char *name, const void *image, u32 len)
|
2019-07-25 11:21:58 +09:00
|
|
|
{
|
|
|
|
log_error(_("no remote program execution supported\n"));
|
|
|
|
return GPG_ERR_GENERAL;
|
|
|
|
}
|
|
|
|
#else /* ! NO_EXEC */
|
|
|
|
#include "../common/membuf.h"
|
|
|
|
|
|
|
|
/* Makes a temp directory and filenames */
|
|
|
|
static int
|
2019-07-25 11:41:37 +09:00
|
|
|
setup_input_file (struct spawn_info *info, const char *name)
|
2019-07-25 11:21:58 +09:00
|
|
|
{
|
2019-07-25 11:41:37 +09:00
|
|
|
char *tmp = opt.temp_dir;
|
|
|
|
int len;
|
|
|
|
#define TEMPLATE "gpg-XXXXXX"
|
2019-07-25 11:21:58 +09:00
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
/* Initialize by the length of last part in the path + 1 */
|
|
|
|
len = strlen (DIRSEP_S) + strlen (TEMPLATE) + 1;
|
2019-07-25 11:21:58 +09:00
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
/* Make up the temp dir and file in case we need them */
|
|
|
|
if (tmp)
|
|
|
|
{
|
|
|
|
len += strlen (tmp);
|
|
|
|
info->tempdir = xmalloc (len);
|
|
|
|
}
|
|
|
|
else
|
2019-07-25 11:21:58 +09:00
|
|
|
{
|
|
|
|
#if defined (_WIN32)
|
2019-07-25 11:41:37 +09:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
tmp = xmalloc (MAX_PATH+1);
|
|
|
|
if (!tmp)
|
|
|
|
return -1;
|
2019-07-25 11:21:58 +09:00
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
ret = GetTempPath (MAX_PATH-len, tmp);
|
|
|
|
if (ret == 0 || ret >= MAX_PATH-len)
|
|
|
|
strcpy (tmp, "c:\\windows\\temp");
|
2019-07-25 11:21:58 +09:00
|
|
|
else
|
|
|
|
{
|
|
|
|
/* GetTempPath may return with \ on the end */
|
2019-07-25 11:41:37 +09:00
|
|
|
while (ret > 0 && tmp[ret-1] == '\\')
|
2019-07-25 11:21:58 +09:00
|
|
|
{
|
2019-07-25 11:41:37 +09:00
|
|
|
tmp[ret-1]='\0';
|
|
|
|
ret--;
|
2019-07-25 11:21:58 +09:00
|
|
|
}
|
|
|
|
}
|
2019-07-25 11:41:37 +09:00
|
|
|
|
|
|
|
len += ret;
|
|
|
|
info->tempdir = tmp;
|
2019-07-25 11:21:58 +09:00
|
|
|
#else /* More unixish systems */
|
2019-07-25 11:41:37 +09:00
|
|
|
if (!(tmp = getenv ("TMPDIR"))
|
|
|
|
&& !(tmp = getenv ("TMP")))
|
|
|
|
tmp = "/tmp";
|
|
|
|
|
|
|
|
len += strlen (tmp);
|
|
|
|
info->tempdir = xmalloc (len);
|
2019-07-25 11:21:58 +09:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
if (info->tempdir == NULL)
|
|
|
|
return -1;
|
2019-07-25 11:21:58 +09:00
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
sprintf (info->tempdir, "%s" DIRSEP_S TEMPLATE, tmp);
|
2019-07-25 11:21:58 +09:00
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
if (gnupg_mkdtemp (info->tempdir) == NULL)
|
2019-07-25 11:21:58 +09:00
|
|
|
{
|
2019-07-25 11:41:37 +09:00
|
|
|
log_error (_("can't create directory '%s': %s\n"),
|
|
|
|
info->tempdir, strerror (errno));
|
|
|
|
return -1;
|
2019-07-25 11:21:58 +09:00
|
|
|
}
|
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
info->tempfile = xmalloc (strlen (info->tempdir) + strlen (DIRSEP_S)
|
|
|
|
+ strlen (name) + 1);
|
|
|
|
if (info->tempfile == NULL)
|
|
|
|
{
|
|
|
|
xfree (info->tempdir);
|
|
|
|
info->tempdir = NULL;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
sprintf (info->tempfile, "%s" DIRSEP_S "%s", info->tempdir, name);
|
|
|
|
return 0;
|
2019-07-25 11:21:58 +09:00
|
|
|
}
|
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
/* Expands %i or %I in the args to the full temp file within the temp
|
|
|
|
directory. */
|
2019-07-25 11:21:58 +09:00
|
|
|
static int
|
2019-07-25 11:41:37 +09:00
|
|
|
expand_args (struct spawn_info *info, const char *args_in, const char *name)
|
2019-07-25 11:21:58 +09:00
|
|
|
{
|
|
|
|
const char *ch = args_in;
|
|
|
|
membuf_t command;
|
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
info->keep_temp_file = 0;
|
2019-07-25 11:21:58 +09:00
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
if (DBG_EXTPROG)
|
|
|
|
log_debug ("expanding string \"%s\"\n", args_in);
|
2019-07-25 11:21:58 +09:00
|
|
|
|
|
|
|
init_membuf (&command, 100);
|
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
while (*ch != '\0')
|
2019-07-25 11:21:58 +09:00
|
|
|
{
|
2019-07-25 11:41:37 +09:00
|
|
|
if (*ch == '%')
|
2019-07-25 11:21:58 +09:00
|
|
|
{
|
2019-07-25 11:41:37 +09:00
|
|
|
const char *append = NULL;
|
2019-07-25 11:21:58 +09:00
|
|
|
|
|
|
|
ch++;
|
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
switch (*ch)
|
2019-07-25 11:21:58 +09:00
|
|
|
{
|
|
|
|
case 'I':
|
2019-07-25 11:41:37 +09:00
|
|
|
info->keep_temp_file = 1;
|
2019-07-25 11:21:58 +09:00
|
|
|
/* fall through */
|
|
|
|
|
|
|
|
case 'i': /* in */
|
2019-07-25 11:41:37 +09:00
|
|
|
if (info->tempfile == NULL)
|
2019-07-25 11:21:58 +09:00
|
|
|
{
|
2019-07-25 11:41:37 +09:00
|
|
|
if (setup_input_file (info, name) < 0)
|
2019-07-25 11:21:58 +09:00
|
|
|
goto fail;
|
|
|
|
}
|
2019-07-25 11:41:37 +09:00
|
|
|
append = info->tempfile;
|
2019-07-25 11:21:58 +09:00
|
|
|
break;
|
|
|
|
|
|
|
|
case '%':
|
2019-07-25 11:41:37 +09:00
|
|
|
append = "%";
|
2019-07-25 11:21:58 +09:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
if (append)
|
2019-07-25 11:21:58 +09:00
|
|
|
put_membuf_str (&command, append);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
put_membuf (&command, ch, 1);
|
|
|
|
|
|
|
|
ch++;
|
|
|
|
}
|
|
|
|
|
|
|
|
put_membuf (&command, "", 1); /* Terminate string. */
|
|
|
|
|
|
|
|
info->command = get_membuf (&command, NULL);
|
|
|
|
if (!info->command)
|
2019-07-25 11:41:37 +09:00
|
|
|
return -1;
|
2019-07-25 11:21:58 +09:00
|
|
|
|
|
|
|
if(DBG_EXTPROG)
|
2019-07-25 11:41:37 +09:00
|
|
|
log_debug("args expanded to \"%s\", use %s, keep %u\n", info->command,
|
|
|
|
info->tempfile, info->keep_temp_file);
|
2019-07-25 11:21:58 +09:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
xfree (get_membuf (&command, NULL));
|
2019-07-25 11:41:37 +09:00
|
|
|
return -1;
|
2019-07-25 11:21:58 +09:00
|
|
|
}
|
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
#ifndef EXEC_TEMPFILE_ONLY
|
|
|
|
static void
|
|
|
|
fill_command_argv (const char *argv[4], const char *command)
|
2019-07-25 11:21:58 +09:00
|
|
|
{
|
2019-07-25 11:41:37 +09:00
|
|
|
argv[0] = getenv ("SHELL");
|
|
|
|
if (argv[0] == NULL)
|
|
|
|
argv[0] = "/bin/sh";
|
2019-07-25 11:21:58 +09:00
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
argv[1] = "-c";
|
|
|
|
argv[2] = command;
|
|
|
|
argv[3] = NULL;
|
|
|
|
}
|
2019-07-25 11:21:58 +09:00
|
|
|
#endif
|
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
static void
|
|
|
|
run_with_pipe (struct spawn_info *info, const void *image, u32 len)
|
|
|
|
{
|
|
|
|
#ifdef EXEC_TEMPFILE_ONLY
|
|
|
|
(void)info;
|
|
|
|
(void)image;
|
|
|
|
(void)len;
|
|
|
|
log_error (_("this platform requires temporary files when calling"
|
|
|
|
" external programs\n"));
|
|
|
|
return;
|
|
|
|
#else /* !EXEC_TEMPFILE_ONLY */
|
|
|
|
gpg_error_t err;
|
|
|
|
const char *argv[4];
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 09:39:15 +09:00
|
|
|
gpgrt_process_t proc;
|
2019-07-25 11:21:58 +09:00
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
fill_command_argv (argv, info->command);
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 09:39:15 +09:00
|
|
|
err = gpgrt_process_spawn (argv[0], argv+1, GPGRT_PROCESS_STDIN_PIPE,
|
2024-05-31 15:36:39 +09:00
|
|
|
NULL, &proc);
|
2019-07-25 11:41:37 +09:00
|
|
|
if (err)
|
common,agent,gpg,dirmngr,g13,scd,tests,tools: New spawn function.
* common/exechelp-posix.c (do_exec, gnupg_spawn_process): Remove.
(check_syscall_func, pre_syscall, post_syscall) : New.
(do_create_socketpair, posix_open_null, call_spawn_cb): New.
(my_exec, spawn_detached, gnupg_spawn_helper): New.
(gnupg_process_spawn, process_kill, gnupg_process_terminate): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_release): New.
(gnupg_process_wait_list): New.
* common/exechelp-w32.c: Add definition of _WIN32_WINNT as 0x600.
(check_syscall_func, pre_syscall, post_syscall): New.
(gnupg_spawn_process): Remove.
(check_windows_version): New.
(spawn_detached, gnupg_spawn_helper, gnupg_process_spawn): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_kill, process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_terminate): New.
(gnupg_process_release, gnupg_process_wait_list): New.
* common/exechelp.h: Re-write for new API.
* common/exectool.c (gnupg_exec_tool_stream): Follow the change.
* common/asshelp.c (start_new_service): Likewise.
* agent/genkey.c (do_check_passphrase_pattern): Likewise.
* dirmngr/ldap-wrapper.c (struct wrapper_context_s): Use PROC.
(destroy_wrapper): Follow the change of API.
(read_log_data): Follow the change of API, use printable_pid.
(ldap_reaper_thread, ldap_wrapper_release_context): Likewise.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Likewise.
* g10/photoid.c (run_with_pipe): Follow the change of API.
(show_photo): Likewise.
* g13/be-encfs.c (run_umount_helper): Likewise.
(run_encfs_tool): Likewise.
* g13/g13.c: Add including ./common/exechelp.h.
* g13/mount.c: Likewise.
* g13/runner.c: Follow the change of API.
* g13/runner.h: Follow the change of API.
* scd/app.c (setup_env): New.
(report_change): Follow the change of API.
* tests/gpgscm/ffi.c (proc_object_finalize): New.
(proc_object_to_string): New.
(proc_wrap, proc_unwrap): New.
(do_spawn_process): Remove.
(do_process_spawn): New.
(setup_std_fds): New.
(do_spawn_process_fd): Remove.
(do_process_spawn_fd): New.
(do_wait_process): Remove.
(do_process_wait): New.
(do_wait_processes): Remove.
* tests/gpgscm/t-child.scm: Follow the change of API.
* tests/gpgscm/tests.scm: Likewise.
* tests/openpgp/defs.scm: Likewise.
* tests/tpm2dtests/defs.scm: Likewise.
* tools/gpg-card.c: Likewise.
* tools/gpgconf-comp.c: Likewise.
* tools/gpgconf.c: Likewise.
* tools/gpgtar-create.c: Likewise.
* tools/gpgtar-extract.c: Likewise.
* tools/gpgtar-list.c: Likewise.
--
GnuPG-bug-id: 6275
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2023-05-11 19:18:21 +09:00
|
|
|
log_error (_("unable to execute shell '%s': %s\n"),
|
|
|
|
argv[0], gpg_strerror (err));
|
2019-07-25 11:41:37 +09:00
|
|
|
else
|
2019-07-25 11:21:58 +09:00
|
|
|
{
|
common,agent,gpg,dirmngr,g13,scd,tests,tools: New spawn function.
* common/exechelp-posix.c (do_exec, gnupg_spawn_process): Remove.
(check_syscall_func, pre_syscall, post_syscall) : New.
(do_create_socketpair, posix_open_null, call_spawn_cb): New.
(my_exec, spawn_detached, gnupg_spawn_helper): New.
(gnupg_process_spawn, process_kill, gnupg_process_terminate): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_release): New.
(gnupg_process_wait_list): New.
* common/exechelp-w32.c: Add definition of _WIN32_WINNT as 0x600.
(check_syscall_func, pre_syscall, post_syscall): New.
(gnupg_spawn_process): Remove.
(check_windows_version): New.
(spawn_detached, gnupg_spawn_helper, gnupg_process_spawn): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_kill, process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_terminate): New.
(gnupg_process_release, gnupg_process_wait_list): New.
* common/exechelp.h: Re-write for new API.
* common/exectool.c (gnupg_exec_tool_stream): Follow the change.
* common/asshelp.c (start_new_service): Likewise.
* agent/genkey.c (do_check_passphrase_pattern): Likewise.
* dirmngr/ldap-wrapper.c (struct wrapper_context_s): Use PROC.
(destroy_wrapper): Follow the change of API.
(read_log_data): Follow the change of API, use printable_pid.
(ldap_reaper_thread, ldap_wrapper_release_context): Likewise.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Likewise.
* g10/photoid.c (run_with_pipe): Follow the change of API.
(show_photo): Likewise.
* g13/be-encfs.c (run_umount_helper): Likewise.
(run_encfs_tool): Likewise.
* g13/g13.c: Add including ./common/exechelp.h.
* g13/mount.c: Likewise.
* g13/runner.c: Follow the change of API.
* g13/runner.h: Follow the change of API.
* scd/app.c (setup_env): New.
(report_change): Follow the change of API.
* tests/gpgscm/ffi.c (proc_object_finalize): New.
(proc_object_to_string): New.
(proc_wrap, proc_unwrap): New.
(do_spawn_process): Remove.
(do_process_spawn): New.
(setup_std_fds): New.
(do_spawn_process_fd): Remove.
(do_process_spawn_fd): New.
(do_wait_process): Remove.
(do_process_wait): New.
(do_wait_processes): Remove.
* tests/gpgscm/t-child.scm: Follow the change of API.
* tests/gpgscm/tests.scm: Likewise.
* tests/openpgp/defs.scm: Likewise.
* tests/tpm2dtests/defs.scm: Likewise.
* tools/gpg-card.c: Likewise.
* tools/gpgconf-comp.c: Likewise.
* tools/gpgconf.c: Likewise.
* tools/gpgtar-create.c: Likewise.
* tools/gpgtar-extract.c: Likewise.
* tools/gpgtar-list.c: Likewise.
--
GnuPG-bug-id: 6275
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2023-05-11 19:18:21 +09:00
|
|
|
int fd_in;
|
2019-07-25 11:21:58 +09:00
|
|
|
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 09:39:15 +09:00
|
|
|
err = gpgrt_process_get_fds (proc, 0, &fd_in, NULL, NULL);
|
common,agent,gpg,dirmngr,g13,scd,tests,tools: New spawn function.
* common/exechelp-posix.c (do_exec, gnupg_spawn_process): Remove.
(check_syscall_func, pre_syscall, post_syscall) : New.
(do_create_socketpair, posix_open_null, call_spawn_cb): New.
(my_exec, spawn_detached, gnupg_spawn_helper): New.
(gnupg_process_spawn, process_kill, gnupg_process_terminate): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_release): New.
(gnupg_process_wait_list): New.
* common/exechelp-w32.c: Add definition of _WIN32_WINNT as 0x600.
(check_syscall_func, pre_syscall, post_syscall): New.
(gnupg_spawn_process): Remove.
(check_windows_version): New.
(spawn_detached, gnupg_spawn_helper, gnupg_process_spawn): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_kill, process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_terminate): New.
(gnupg_process_release, gnupg_process_wait_list): New.
* common/exechelp.h: Re-write for new API.
* common/exectool.c (gnupg_exec_tool_stream): Follow the change.
* common/asshelp.c (start_new_service): Likewise.
* agent/genkey.c (do_check_passphrase_pattern): Likewise.
* dirmngr/ldap-wrapper.c (struct wrapper_context_s): Use PROC.
(destroy_wrapper): Follow the change of API.
(read_log_data): Follow the change of API, use printable_pid.
(ldap_reaper_thread, ldap_wrapper_release_context): Likewise.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Likewise.
* g10/photoid.c (run_with_pipe): Follow the change of API.
(show_photo): Likewise.
* g13/be-encfs.c (run_umount_helper): Likewise.
(run_encfs_tool): Likewise.
* g13/g13.c: Add including ./common/exechelp.h.
* g13/mount.c: Likewise.
* g13/runner.c: Follow the change of API.
* g13/runner.h: Follow the change of API.
* scd/app.c (setup_env): New.
(report_change): Follow the change of API.
* tests/gpgscm/ffi.c (proc_object_finalize): New.
(proc_object_to_string): New.
(proc_wrap, proc_unwrap): New.
(do_spawn_process): Remove.
(do_process_spawn): New.
(setup_std_fds): New.
(do_spawn_process_fd): Remove.
(do_process_spawn_fd): New.
(do_wait_process): Remove.
(do_process_wait): New.
(do_wait_processes): Remove.
* tests/gpgscm/t-child.scm: Follow the change of API.
* tests/gpgscm/tests.scm: Likewise.
* tests/openpgp/defs.scm: Likewise.
* tests/tpm2dtests/defs.scm: Likewise.
* tools/gpg-card.c: Likewise.
* tools/gpgconf-comp.c: Likewise.
* tools/gpgconf.c: Likewise.
* tools/gpgtar-create.c: Likewise.
* tools/gpgtar-extract.c: Likewise.
* tools/gpgtar-list.c: Likewise.
--
GnuPG-bug-id: 6275
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2023-05-11 19:18:21 +09:00
|
|
|
if (err)
|
|
|
|
log_error ("unable to get pipe connection '%s': %s\n",
|
|
|
|
argv[2], gpg_strerror (err));
|
|
|
|
else
|
|
|
|
{
|
|
|
|
write (fd_in, image, len);
|
|
|
|
close (fd_in);
|
|
|
|
}
|
|
|
|
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 09:39:15 +09:00
|
|
|
err = gpgrt_process_wait (proc, 1);
|
2019-07-25 11:41:37 +09:00
|
|
|
if (err)
|
|
|
|
log_error (_("unnatural exit of external program\n"));
|
common,agent,gpg,dirmngr,g13,scd,tests,tools: New spawn function.
* common/exechelp-posix.c (do_exec, gnupg_spawn_process): Remove.
(check_syscall_func, pre_syscall, post_syscall) : New.
(do_create_socketpair, posix_open_null, call_spawn_cb): New.
(my_exec, spawn_detached, gnupg_spawn_helper): New.
(gnupg_process_spawn, process_kill, gnupg_process_terminate): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_release): New.
(gnupg_process_wait_list): New.
* common/exechelp-w32.c: Add definition of _WIN32_WINNT as 0x600.
(check_syscall_func, pre_syscall, post_syscall): New.
(gnupg_spawn_process): Remove.
(check_windows_version): New.
(spawn_detached, gnupg_spawn_helper, gnupg_process_spawn): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_kill, process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_terminate): New.
(gnupg_process_release, gnupg_process_wait_list): New.
* common/exechelp.h: Re-write for new API.
* common/exectool.c (gnupg_exec_tool_stream): Follow the change.
* common/asshelp.c (start_new_service): Likewise.
* agent/genkey.c (do_check_passphrase_pattern): Likewise.
* dirmngr/ldap-wrapper.c (struct wrapper_context_s): Use PROC.
(destroy_wrapper): Follow the change of API.
(read_log_data): Follow the change of API, use printable_pid.
(ldap_reaper_thread, ldap_wrapper_release_context): Likewise.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Likewise.
* g10/photoid.c (run_with_pipe): Follow the change of API.
(show_photo): Likewise.
* g13/be-encfs.c (run_umount_helper): Likewise.
(run_encfs_tool): Likewise.
* g13/g13.c: Add including ./common/exechelp.h.
* g13/mount.c: Likewise.
* g13/runner.c: Follow the change of API.
* g13/runner.h: Follow the change of API.
* scd/app.c (setup_env): New.
(report_change): Follow the change of API.
* tests/gpgscm/ffi.c (proc_object_finalize): New.
(proc_object_to_string): New.
(proc_wrap, proc_unwrap): New.
(do_spawn_process): Remove.
(do_process_spawn): New.
(setup_std_fds): New.
(do_spawn_process_fd): Remove.
(do_process_spawn_fd): New.
(do_wait_process): Remove.
(do_process_wait): New.
(do_wait_processes): Remove.
* tests/gpgscm/t-child.scm: Follow the change of API.
* tests/gpgscm/tests.scm: Likewise.
* tests/openpgp/defs.scm: Likewise.
* tests/tpm2dtests/defs.scm: Likewise.
* tools/gpg-card.c: Likewise.
* tools/gpgconf-comp.c: Likewise.
* tools/gpgconf.c: Likewise.
* tools/gpgtar-create.c: Likewise.
* tools/gpgtar-extract.c: Likewise.
* tools/gpgtar-list.c: Likewise.
--
GnuPG-bug-id: 6275
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2023-05-11 19:18:21 +09:00
|
|
|
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 09:39:15 +09:00
|
|
|
gpgrt_process_release (proc);
|
2019-07-25 11:21:58 +09:00
|
|
|
}
|
|
|
|
#endif /* !EXEC_TEMPFILE_ONLY */
|
2019-07-25 11:41:37 +09:00
|
|
|
}
|
2019-07-25 11:21:58 +09:00
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
static int
|
|
|
|
create_temp_file (struct spawn_info *info, const void *ptr, u32 len)
|
|
|
|
{
|
|
|
|
if (DBG_EXTPROG)
|
|
|
|
log_debug ("using temp file '%s'\n", info->tempfile);
|
2019-07-25 11:21:58 +09:00
|
|
|
|
|
|
|
/* It's not fork/exec/pipe, so create a temp file */
|
2019-07-25 11:41:37 +09:00
|
|
|
if ( is_secured_filename (info->tempfile) )
|
2019-07-25 11:21:58 +09:00
|
|
|
{
|
2019-07-25 11:41:37 +09:00
|
|
|
log_error (_("can't create '%s': %s\n"),
|
|
|
|
info->tempfile, strerror (EPERM));
|
2019-07-25 11:21:58 +09:00
|
|
|
gpg_err_set_errno (EPERM);
|
2019-07-25 11:41:37 +09:00
|
|
|
return -1;
|
2019-07-25 11:21:58 +09:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2020-10-20 11:52:16 +02:00
|
|
|
estream_t fp = es_fopen (info->tempfile, "wb");
|
2019-07-25 11:21:58 +09:00
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
if (fp)
|
|
|
|
{
|
2020-10-20 11:52:16 +02:00
|
|
|
es_fwrite (ptr, len, 1, fp);
|
|
|
|
es_fclose (fp);
|
2019-07-25 11:41:37 +09:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
int save = errno;
|
|
|
|
log_error (_("can't create '%s': %s\n"),
|
|
|
|
info->tempfile, strerror(errno));
|
|
|
|
gpg_err_set_errno (save);
|
|
|
|
return -1;
|
|
|
|
}
|
2019-07-25 11:21:58 +09:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
static void
|
|
|
|
show_photo (const char *command, const char *name, const void *image, u32 len)
|
2019-07-25 11:21:58 +09:00
|
|
|
{
|
2019-07-25 11:41:37 +09:00
|
|
|
struct spawn_info *spawn;
|
2019-07-25 11:21:58 +09:00
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
spawn = xmalloc_clear (sizeof (struct spawn_info));
|
|
|
|
if (!spawn)
|
|
|
|
return;
|
2019-07-25 11:21:58 +09:00
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
/* Expand the args */
|
|
|
|
if (expand_args (spawn, command, name) < 0)
|
2019-07-25 11:21:58 +09:00
|
|
|
{
|
2019-07-25 11:41:37 +09:00
|
|
|
xfree (spawn);
|
|
|
|
return;
|
2019-07-25 11:21:58 +09:00
|
|
|
}
|
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
if (DBG_EXTPROG)
|
|
|
|
log_debug ("running command: %s\n", spawn->command);
|
2019-07-25 11:21:58 +09:00
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
if (spawn->tempfile == NULL)
|
|
|
|
run_with_pipe (spawn, image, len);
|
|
|
|
else if (create_temp_file (spawn, image, len) == 0)
|
2019-07-25 11:21:58 +09:00
|
|
|
{
|
2019-07-25 11:41:37 +09:00
|
|
|
#if defined (_WIN32)
|
|
|
|
if (w32_system (spawn->command) < 0)
|
|
|
|
log_error (_("system error while calling external program: %s\n"),
|
|
|
|
strerror (errno));
|
|
|
|
#else
|
|
|
|
gpg_error_t err;
|
|
|
|
const char *argv[4];
|
|
|
|
|
|
|
|
fill_command_argv (argv, spawn->command);
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 09:39:15 +09:00
|
|
|
err = gpgrt_process_spawn (argv[0], argv+1, 0, NULL, NULL);
|
2019-07-25 11:41:37 +09:00
|
|
|
if (err)
|
|
|
|
log_error (_("unnatural exit of external program\n"));
|
2019-07-25 11:21:58 +09:00
|
|
|
#endif
|
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
if (!spawn->keep_temp_file)
|
|
|
|
{
|
|
|
|
if (unlink (spawn->tempfile) < 0)
|
|
|
|
log_info (_("WARNING: unable to remove tempfile (%s) '%s': %s\n"),
|
|
|
|
"in", spawn->tempfile, strerror(errno));
|
2019-07-25 11:21:58 +09:00
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
if (rmdir (spawn->tempdir) < 0)
|
|
|
|
log_info (_("WARNING: unable to remove temp directory '%s': %s\n"),
|
|
|
|
spawn->tempdir, strerror(errno));
|
|
|
|
}
|
2019-07-25 11:21:58 +09:00
|
|
|
}
|
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
xfree(spawn->command);
|
|
|
|
xfree(spawn->tempdir);
|
|
|
|
xfree(spawn->tempfile);
|
|
|
|
xfree(spawn);
|
2019-07-25 11:21:58 +09:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
2016-05-21 11:41:49 +02:00
|
|
|
|
2008-10-03 20:00:46 +00:00
|
|
|
void
|
2016-05-21 11:41:49 +02:00
|
|
|
show_photos (ctrl_t ctrl, const struct user_attribute *attrs, int count,
|
|
|
|
PKT_public_key *pk, PKT_user_id *uid)
|
2003-06-05 07:14:21 +00:00
|
|
|
{
|
2014-02-10 19:48:42 +01:00
|
|
|
#ifdef DISABLE_PHOTO_VIEWER
|
|
|
|
(void)attrs;
|
|
|
|
(void)count;
|
|
|
|
(void)pk;
|
|
|
|
(void)uid;
|
|
|
|
#else /*!DISABLE_PHOTO_VIEWER*/
|
2003-06-05 07:14:21 +00:00
|
|
|
int i;
|
|
|
|
struct expando_args args;
|
|
|
|
u32 len;
|
|
|
|
u32 kid[2]={0,0};
|
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
if (opt.exec_disable && !opt.no_perm_warn)
|
|
|
|
{
|
|
|
|
log_info (_("external program calls are disabled due to unsafe "
|
|
|
|
"options file permissions\n"));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
|
|
|
|
/* There should be no way to get to this spot while still carrying
|
|
|
|
setuid privs. Just in case, bomb out if we are. */
|
|
|
|
if ( getuid () != geteuid ())
|
|
|
|
BUG ();
|
|
|
|
#endif
|
|
|
|
|
2010-04-23 11:36:59 +00:00
|
|
|
memset (&args, 0, sizeof(args));
|
|
|
|
args.pk = pk;
|
2016-11-23 12:29:22 +01:00
|
|
|
args.validity_info = get_validity_info (ctrl, NULL, pk, uid);
|
2016-05-21 11:41:49 +02:00
|
|
|
args.validity_string = get_validity_string (ctrl, pk, uid);
|
2014-04-15 16:40:48 +02:00
|
|
|
namehash_from_uid (uid);
|
|
|
|
args.namehash = uid->namehash;
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2010-04-23 11:36:59 +00:00
|
|
|
if (pk)
|
|
|
|
keyid_from_pk (pk, kid);
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2019-05-17 12:31:11 +02:00
|
|
|
es_fflush (es_stdout);
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
#ifdef FIXED_PHOTO_VIEWER
|
2019-07-25 11:41:37 +09:00
|
|
|
opt.photo_viewer = FIXED_PHOTO_VIEWER;
|
2003-06-05 07:14:21 +00:00
|
|
|
#else
|
2019-07-25 11:41:37 +09:00
|
|
|
if (!opt.photo_viewer)
|
|
|
|
opt.photo_viewer = get_default_photo_command ();
|
2003-06-05 07:14:21 +00:00
|
|
|
#endif
|
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
for (i=0; i<count; i++)
|
|
|
|
if (attrs[i].type == ATTRIB_IMAGE
|
|
|
|
&& parse_image_header (&attrs[i], &args.imagetype, &len))
|
|
|
|
{
|
|
|
|
char *command, *name;
|
|
|
|
int offset = attrs[i].len-len;
|
|
|
|
|
2003-06-05 07:14:21 +00:00
|
|
|
/* make command grow */
|
2019-09-27 15:44:23 +02:00
|
|
|
command = pct_expando (ctrl, opt.photo_viewer,&args);
|
2003-06-05 07:14:21 +00:00
|
|
|
if(!command)
|
|
|
|
goto fail;
|
2020-11-02 17:23:53 +01:00
|
|
|
if (!*command)
|
|
|
|
{
|
|
|
|
xfree (command);
|
|
|
|
goto fail;
|
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
name = xmalloc (1 + 16 + strlen(EXTSEP_S)
|
|
|
|
+ strlen (image_type_to_string (args.imagetype, 0)));
|
|
|
|
|
|
|
|
if (!name)
|
|
|
|
{
|
|
|
|
xfree (command);
|
|
|
|
goto fail;
|
|
|
|
}
|
2003-06-05 07:14:21 +00:00
|
|
|
|
|
|
|
/* Make the filename. Notice we are not using the image
|
|
|
|
encoding type for more than cosmetics. Most external image
|
|
|
|
viewers can handle a multitude of types, and even if one
|
|
|
|
cannot understand a particular type, we have no way to know
|
|
|
|
which. The spec permits this, by the way. -dms */
|
|
|
|
|
|
|
|
#ifdef USE_ONLY_8DOT3
|
2019-07-25 11:41:37 +09:00
|
|
|
sprintf (name,"%08lX" EXTSEP_S "%s", (ulong)kid[1],
|
|
|
|
image_type_to_string (args.imagetype, 0));
|
2003-06-05 07:14:21 +00:00
|
|
|
#else
|
2019-07-25 11:41:37 +09:00
|
|
|
sprintf (name, "%08lX%08lX" EXTSEP_S "%s",
|
|
|
|
(ulong)kid[0], (ulong)kid[1],
|
|
|
|
image_type_to_string (args.imagetype, 0));
|
2003-06-05 07:14:21 +00:00
|
|
|
#endif
|
|
|
|
|
2019-07-25 11:41:37 +09:00
|
|
|
show_photo (command, name, &attrs[i].data[offset], len);
|
|
|
|
xfree (name);
|
|
|
|
xfree (command);
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
log_error(_("unable to display photo ID!\n"));
|
2014-02-10 19:48:42 +01:00
|
|
|
#endif /*!DISABLE_PHOTO_VIEWER*/
|
2003-06-05 07:14:21 +00:00
|
|
|
}
|