security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

tools: Minor fix to the usbmon debugging tool. 

--
* tools/ccidmon.c (GNUPG_NAME): Define if not defined.
(digitp, hexdigitp): Change to our common semantics.

--
Note that this tool only exists in the repo.

GnuPG-bug-id: 2678
Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-09-13 08:26:56 +02:00
parent 31fc420727
commit 9da780e5c4
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/ccidmon.c
View File

@ -45,6 +45,9 @@
# define PACKAGE_BUGREPORT "devnull@example.org" # define PACKAGE_BUGREPORT "devnull@example.org"
#endif #endif
#define PGM "ccidmon" #define PGM "ccidmon"
#ifndef GNUPG_NAME
# define GNUPG_NAME "GnuPG"
#endif
/* Option flags. */ /* Option flags. */
static int verbose; static int verbose;
@ -94,10 +97,10 @@ enum {
}; };
#define digitp(p) ((p) >= '0' && (p) <= '9') #define digitp(p) (*(p) >= '0' && *(p) <= '9')
#define hexdigitp(a) (digitp (a) \ #define hexdigitp(a) (digitp (a) \
|| ((a) >= 'A' && (a) <= 'F') \ || (*(a) >= 'A' && *(a) <= 'F') \
|| ((a) >= 'a' && (a) <= 'f')) || (*(a) >= 'a' && *(a) <= 'f'))
#define ascii_isspace(a) ((a)==' ' || (a)=='\n' || (a)=='\r' || (a)=='\t') #define ascii_isspace(a) ((a)==' ' || (a)=='\n' || (a)=='\r' || (a)=='\t')
#define xtoi_1(p) ((p) <= '9'? ((p)- '0'): \ #define xtoi_1(p) ((p) <= '9'? ((p)- '0'): \
(p) <= 'F'? ((p)-'A'+10):((p)-'a'+10)) (p) <= 'F'? ((p)-'A'+10):((p)-'a'+10))
@ -172,7 +175,7 @@ print_pr_data (const unsigned char *data, size_t datalen, size_t off)
{ {
if (needlf) if (needlf)
putchar ('\n'); putchar ('\n');
printf (" [%04d] ", off); printf (" [%04lu] ", (unsigned long)off);
} }
printf (" %02X", data[off]); printf (" %02X", data[off]);
needlf = 1; needlf = 1;
@ -608,14 +611,14 @@ collect_data (char *hexdata, const char *address, unsigned int lineno)
{ {
if (ascii_isspace (*s)) if (ascii_isspace (*s))
continue; continue;
if (!hexdigitp (*s)) if (!hexdigitp (s))
{ {
err ("invalid hex digit in line %u - line skipped", lineno); err ("invalid hex digit in line %u - line skipped", lineno);
break; break;
} }
value = xtoi_1 (*s) * 16; value = xtoi_1 (*s) * 16;
s++; s++;
if (!hexdigitp (*s)) if (!hexdigitp (s))
{ {
err ("invalid hex digit in line %u - line skipped", lineno); err ("invalid hex digit in line %u - line skipped", lineno);
break; break;
@ -712,8 +715,8 @@ parse_line_sniffusb (char *line, unsigned int lineno)
if (!p) if (!p)
return; return;
if (hexdigitp (p[0]) && hexdigitp (p[1]) if (hexdigitp (p+0) && hexdigitp (p+1)
&& hexdigitp (p[2]) && hexdigitp (p[3]) && hexdigitp (p+2) && hexdigitp (p+3)
&& p[4] == ':' && !p[5]) && p[4] == ':' && !p[5])
{ {
size_t length; size_t length;
@ -722,7 +725,7 @@ parse_line_sniffusb (char *line, unsigned int lineno)
length = databuffer.count; length = databuffer.count;
while ((p=strtok (NULL, " \t"))) while ((p=strtok (NULL, " \t")))
{ {
if (!hexdigitp (p[0]) || !hexdigitp (p[1])) if (!hexdigitp (p+0) || !hexdigitp (p+1))
{ {
err ("invalid hex digit in line %u (%s)", lineno,p); err ("invalid hex digit in line %u (%s)", lineno,p);
break; break;
@ -810,7 +813,7 @@ main (int argc, char **argv)
} }
else if (!strcmp (*argv, "--version")) else if (!strcmp (*argv, "--version"))
{ {
fputs (PGM " ("GNUPG_NAME") " PACKAGE_VERSION "\n", stdout); fputs (PGM " (" GNUPG_NAME ") " PACKAGE_VERSION "\n", stdout);
exit (0); exit (0);
} }
else if (!strcmp (*argv, "--help")) else if (!strcmp (*argv, "--help"))