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

gpgconf: Adjust -X command for the new VERSION file format 

* tools/gpgconf.c (show_version_gnupg): Read and parse the entire
VERSION file.
--

GnuPG-bug-id: 6918
This commit is contained in:
Werner Koch 2024-01-09 12:51:34 +01:00
parent 45f6357881
commit 35fd89b168
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
tools/gpgconf.c
View File

@ -1153,10 +1153,12 @@ get_revision_from_blurb (const char *blurb, int *r_len)
static void static void
show_version_gnupg (estream_t fp, const char *prefix) show_version_gnupg (estream_t fp, const char *prefix)
{ {
char *fname, *p; char *fname, *p, *p0;
size_t n; size_t n;
estream_t verfp; estream_t verfp;
char line[100]; char *line = NULL;
size_t line_len = 0;
ssize_t length;
es_fprintf (fp, "%s%sGnuPG %s (%s)\n%s%s\n", prefix, *prefix?"":"* ", es_fprintf (fp, "%s%sGnuPG %s (%s)\n%s%s\n", prefix, *prefix?"":"* ",
gpgrt_strusage (13), BUILD_REVISION, prefix, gpgrt_strusage (17)); gpgrt_strusage (13), BUILD_REVISION, prefix, gpgrt_strusage (17));
@ -1175,20 +1177,46 @@ show_version_gnupg (estream_t fp, const char *prefix)
verfp = es_fopen (fname, "r"); verfp = es_fopen (fname, "r");
if (!verfp) if (!verfp)
es_fprintf (fp, "%s[VERSION file not found]\n", prefix); es_fprintf (fp, "%s[VERSION file not found]\n", prefix);
else if (!es_fgets (line, sizeof line, verfp))
es_fprintf (fp, "%s[VERSION file is empty]\n", prefix);
else else
{ {
trim_spaces (line); int lnr = 0;
for (p=line; *p; p++)
if (*p < ' ' || *p > '~' || *p == '[') p0 = NULL;
*p = '?'; while ((length = es_read_line (verfp, &line, &line_len, NULL))>0)
es_fprintf (fp, "%s%s\n", prefix, line); {
lnr++;
trim_spaces (line);
if (lnr == 1 && *line != '[')
{
/* Old file format where we look only at the
* first line. */
p0 = line;
break;
}
else if (!strncmp (line, "version=", 8))
{
p0 = line + 8;
break;
}
}
if (length < 0 || es_ferror (verfp))
es_fprintf (fp, "%s[VERSION file read error]\n", prefix);
else if (p0)
{
for (p=p0; *p; p++)
if (*p < ' ' || *p > '~' || *p == '[')
*p = '?';
es_fprintf (fp, "%s%s\n", prefix, p0);
}
else
es_fprintf (fp, "%s[VERSION file is empty]\n", prefix);
es_fclose (verfp);
} }
es_fclose (verfp);
} }
xfree (fname); xfree (fname);
} }
xfree (line);
#ifdef HAVE_W32_SYSTEM #ifdef HAVE_W32_SYSTEM
{ {