security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-05-19 09:02:22 +02:00
Code Activity

Add more sytem variables: cwd, foodir and serverpid.

Browse Source
This commit is contained in:
Werner Koch 2007-10-11 18:18:24 +00:00
parent 17fe613ebc
commit f8e3f699a9
2 changed files with 50 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/ChangeLog
View File

@ -5,6 +5,8 @@
(set_var): Return the value. (set_var): Return the value.
(assign_variable): Add arg syslet. (assign_variable): Add arg syslet.
(main): New command /slet. (main): New command /slet.
(gnu_getcwd): New.
(assign_variable): Add tag cwd, and *dir.
2007-10-02 Werner Koch <wk@g10code.com> 2007-10-02 Werner Koch <wk@g10code.com>

55
tools/gpg-connect-agent.c
View File

@ -165,6 +165,26 @@ my_strusage( int level )
return p; return p;
} }
static char *
gnu_getcwd (void)
{
char *buffer;
size_t size = 100;
for (;;)
{
buffer = xmalloc (size+1);
if (getcwd (buffer, size) == buffer)
return buffer;
xfree (buffer);
if (errno != ERANGE)
return NULL;
size *= 2;
}
}
static const char * static const char *
set_var (const char *name, const char *value) set_var (const char *name, const char *value)
@ -291,7 +311,7 @@ substitute_line (char *buffer)
static void static void
assign_variable (char *line, int syslet) assign_variable (char *line, int syslet)
{ {
char *name, *p, *tmp; char *name, *p, *tmp, *free_me;
/* Get the name. */ /* Get the name. */
name = line; name = line;
@ -306,17 +326,38 @@ assign_variable (char *line, int syslet)
set_var (name, NULL); /* Remove variable. */ set_var (name, NULL); /* Remove variable. */
else if (syslet) else if (syslet)
{ {
tmp = opt.enable_varsubst? substitute_line (p) : NULL; free_me = opt.enable_varsubst? substitute_line (p) : NULL;
if (tmp) if (free_me)
p = tmp; p = free_me;
if (!strcmp (p, "homedir")) if (!strcmp (p, "cwd"))
{
tmp = gnu_getcwd ();
if (!tmp)
log_error ("getcwd failed: %s\n", strerror (errno));
set_var (name, tmp);
xfree (tmp);
}
else if (!strcmp (p, "homedir"))
set_var (name, opt.homedir); set_var (name, opt.homedir);
else if (!strcmp (p, "sysconfdir"))
set_var (name, gnupg_sysconfdir ());
else if (!strcmp (p, "bindir"))
set_var (name, gnupg_bindir ());
else if (!strcmp (p, "libdir"))
set_var (name, gnupg_libdir ());
else if (!strcmp (p, "libexecdir"))
set_var (name, gnupg_libexecdir ());
else if (!strcmp (p, "datadir"))
set_var (name, gnupg_datadir ());
else if (!strcmp (p, "serverpid"))
set_int_var (name, (int)server_pid);
else else
{ {
log_error ("undefined tag `%s'\n", p); log_error ("undefined tag `%s'\n", p);
log_info ("valid tags are: homedir\n"); log_info ("valid tags are: cwd, {home,bin,lib,libexec,data}dir, "
"serverpid\n");
} }
xfree (tmp); xfree (free_me);
} }
else else
{ {