diff options
| author | jbj <devnull@localhost> | 2002-06-30 22:47:32 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2002-06-30 22:47:32 +0000 |
| commit | 8c4991e9d533de552b957ea445d65f6834205f29 (patch) | |
| tree | 159a3aaa6575611308382acbadba3a55d9856bd5 /rpmqv.c | |
| parent | 10e3aaa69f3d7f74958e3dd0d0b471b296a1bb23 (diff) | |
| download | rpm-8c4991e9d533de552b957ea445d65f6834205f29.tar.gz rpm-8c4991e9d533de552b957ea445d65f6834205f29.tar.bz2 rpm-8c4991e9d533de552b957ea445d65f6834205f29.zip | |
- warn only once for each NOKEY/UNTRUSTED key id.
- factor common options into table, add rpmcliInit() and rpmcliFini().
- add preliminary rpmgraph(8) and rpmcache(8) executables to rpm-devel.
CVS patchset: 5535
CVS date: 2002/06/30 22:47:32
Diffstat (limited to 'rpmqv.c')
| -rwxr-xr-x | rpmqv.c | 22 |
1 files changed, 10 insertions, 12 deletions
@@ -34,7 +34,6 @@ #include "debug.h" -#define GETOPT_DBPATH 1010 #define GETOPT_SHOWRC 1018 #define GETOPT_DEFINEMACRO 1020 #define GETOPT_EVALMACRO 1021 @@ -94,13 +93,16 @@ static int help = 0; /*@unchecked@*/ static int noUsageMsg = 0; /*@unchecked@*/ -/*@observer@*/ /*@null@*/ static const char * pipeOutput = NULL; +/*@observer@*/ /*@null@*/ +static const char * pipeOutput = NULL; /*@unchecked@*/ static int quiet = 0; /*@unchecked@*/ -/*@observer@*/ /*@null@*/ static const char * rcfile = NULL; +/*@observer@*/ /*@null@*/ +static const char * rcfile = NULL; /*@unchecked@*/ -/*@observer@*/ /*@null@*/ static char * rootdir = "/"; +/*@observer@*/ /*@null@*/ +static char * rootdir = "/"; /*@unchecked@*/ static int showrc = 0; /*@unchecked@*/ @@ -116,17 +118,13 @@ static struct poptOption rpmAllPoptTable[] = { { "verbose", 'v', 0, 0, 'v', N_("provide more detailed output"), NULL}, { "define", '\0', POPT_ARG_STRING, 0, GETOPT_DEFINEMACRO, - N_("define macro <name> with value <body>"), - N_("'<name> <body>'") }, + N_("define MACRO with value EXPR"), N_("'MACRO EXPR'") }, { "eval", '\0', POPT_ARG_STRING, 0, GETOPT_EVALMACRO, - N_("print macro expansion of <expr>+"), - N_("<expr>+") }, + N_("print macro expansion of EXPR"), N_("'EXPR'") }, { "pipe", '\0', POPT_ARG_STRING|POPT_ARGFLAG_DOC_HIDDEN, &pipeOutput, 0, - N_("send stdout to <cmd>"), - N_("<cmd>") }, + N_("send stdout to <cmd>"), N_("<cmd>") }, { "root", 'r', POPT_ARG_STRING | POPT_ARGFLAG_SHOW_DEFAULT, &rootdir, 0, - N_("use <dir> as the top level directory"), - N_("<dir>") }, + N_("use <dir> as the top level directory"), N_("<dir>") }, { "macros", '\0', POPT_ARG_STRING, ¯ofiles, 0, N_("read <file:...> instead of default macro file(s)"), N_("<file:...>") }, |