security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

tests: Improve portability of fake-pinentry.

Browse Source 
* tests/openpgp/fake-pinentry.c: Make all functions static.
(get_passphrase): s/unlink/remove/ because that is standard C.
(spacep): Rename to whitespace and change all callers.
(main): Move macro out of if-then chain.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-10-26 08:34:18 +02:00
parent 900c18f0b5
commit 21b318452a
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
tests/openpgp/fake-pinentry.c
View File

@ -25,9 +25,10 @@
#include <stdarg.h> #include <stdarg.h>
#include <unistd.h> #include <unistd.h>
FILE *log_stream; static FILE *log_stream;
int
static int
reply (const char *fmt, ...) reply (const char *fmt, ...)
{ {
int result; int result;
@ -48,8 +49,9 @@ reply (const char *fmt, ...)
return result; return result;
} }
/* Return the first line from FNAME, removing it from the file. */ /* Return the first line from FNAME, removing it from the file. */
char * static char *
get_passphrase (const char *fname) get_passphrase (const char *fname)
{ {
char *passphrase = NULL; char *passphrase = NULL;
@ -111,7 +113,7 @@ get_passphrase (const char *fname)
fclose (source); fclose (source);
fclose (sink); fclose (sink);
if (unlink (fname)) if (remove (fname))
{ {
fprintf (stderr, "Failed to remove %s: %s", fprintf (stderr, "Failed to remove %s: %s",
fname, strerror (errno)); fname, strerror (errno));
@ -128,17 +130,19 @@ get_passphrase (const char *fname)
} }
#define spacep(p) (*(p) == ' ' || *(p) == '\t' \ #define whitespacep(p) (*(p) == ' ' || *(p) == '\t' \
|| *(p) == '\r' || *(p) == '\n') || *(p) == '\r' || *(p) == '\n')
/* rstrip line. */ /* rstrip line. */
void static void
rstrip (char *buffer) rstrip (char *buffer)
{ {
char *p; char *p;
if (!*buffer)
return; /* This is to avoid p = buffer - 1 */
for (p = buffer + strlen (buffer) - 1; p >= buffer; p--) for (p = buffer + strlen (buffer) - 1; p >= buffer; p--)
{ {
if (! spacep (p)) if (! whitespacep (p))
break; break;
*p = 0; *p = 0;
} }
@ -155,13 +159,13 @@ rstrip (char *buffer)
char * char *
skip_options (const char *line) skip_options (const char *line)
{ {
while (spacep (line)) while (whitespacep (line))
line++; line++;
while (*line == '-' && line[1] == '-') while (*line == '-' && line[1] == '-')
{ {
while (*line && !spacep (line)) while (*line && !whitespacep (line))
line++; line++;
while (spacep (line)) while (whitespacep (line))
line++; line++;
} }
return (char*) line; return (char*) line;
@ -179,12 +183,12 @@ option_value (const char *line, const char *name)
s = strstr (line, name); s = strstr (line, name);
if (s && s >= skip_options (line)) if (s && s >= skip_options (line))
return NULL; return NULL;
if (s && (s == line || spacep (s-1)) if (s && (s == line || whitespacep (s-1))
&& s[n] && (spacep (s+n) || s[n] == '=')) && s[n] && (whitespacep (s+n) || s[n] == '='))
{ {
s += n + 1; s += n + 1;
s += strspn (s, " "); s += strspn (s, " ");
if (*s && !spacep(s)) if (*s && !whitespacep(s))
return s; return s;
} }
return NULL; return NULL;
@ -207,7 +211,7 @@ main (int argc, char **argv)
setvbuf (stdout, NULL, _IOLBF, BUFSIZ); setvbuf (stdout, NULL, _IOLBF, BUFSIZ);
args = getenv ("PINENTRY_USER_DATA"); args = getenv ("PINENTRY_USER_DATA");
got_environment_user_data = args != NULL; got_environment_user_data = !!args;
if (! args) if (! args)
args = ""; args = "";
@ -216,7 +220,7 @@ main (int argc, char **argv)
if (logfile) if (logfile)
{ {
char *p = logfile, more; char *p = logfile, more;
while (*p && ! spacep (p)) while (*p && ! whitespacep (p))
p++; p++;
more = !! *p; more = !! *p;
*p = 0; *p = 0;
@ -234,7 +238,7 @@ main (int argc, char **argv)
if (passphrasefile) if (passphrasefile)
{ {
char *p = passphrasefile, more; char *p = passphrasefile, more;
while (*p && ! spacep (p)) while (*p && ! whitespacep (p))
p++; p++;
more = !! *p; more = !! *p;
*p = 0; *p = 0;
@ -257,13 +261,13 @@ main (int argc, char **argv)
passphrase = "no PINENTRY_USER_DATA -- using default passphrase"; passphrase = "no PINENTRY_USER_DATA -- using default passphrase";
} }
reply ("# fake-pinentry(%d) started. Passphrase='%s'.\n", reply ("# fake-pinentry(%u) started. Passphrase='%s'.\n",
getpid (), passphrase); (unsigned int)getpid (), passphrase);
reply ("OK - what's up?\n"); reply ("OK - what's up?\n");
while (! feof (stdin)) while (! feof (stdin))
{ {
char buffer[1024], *p; char buffer[1024];
if (fgets (buffer, sizeof buffer, stdin) == NULL) if (fgets (buffer, sizeof buffer, stdin) == NULL)
break; break;
@ -273,6 +277,8 @@ main (int argc, char **argv)
rstrip (buffer); rstrip (buffer);
#define OPT_USER_DATA "OPTION pinentry-user-data="
if (strncmp (buffer, "GETPIN", 6) == 0) if (strncmp (buffer, "GETPIN", 6) == 0)
reply ("D %s\n", passphrase); reply ("D %s\n", passphrase);
else if (strncmp (buffer, "BYE", 3) == 0) else if (strncmp (buffer, "BYE", 3) == 0)
@ -280,7 +286,6 @@ main (int argc, char **argv)
reply ("OK\n"); reply ("OK\n");
break; break;
} }
#define OPT_USER_DATA "OPTION pinentry-user-data="
else if (strncmp (buffer, OPT_USER_DATA, strlen (OPT_USER_DATA)) == 0) else if (strncmp (buffer, OPT_USER_DATA, strlen (OPT_USER_DATA)) == 0)
{ {
if (got_environment_user_data) if (got_environment_user_data)
@ -300,6 +305,8 @@ main (int argc, char **argv)
reply ("OK\n"); reply ("OK\n");
} }
#undef OPT_USER_DATA
reply ("# Connection terminated.\n"); reply ("# Connection terminated.\n");
if (log_stream) if (log_stream)
fclose (log_stream); fclose (log_stream);