fix: define/eval options assumed sizeof(int) == sizeof(void *).

CVS patchset: 3724
CVS date: 2000/05/12 23:10:43

diff --git a/CHANGES b/CHANGES
index 692e3ee..01ccc5b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -37,6 +37,7 @@
        - include RPM-GPG-KEY in file manifest.
        - simplify --last popt alias, date like -qi (bjerrick@easystreet.com).
        - fix: alloca'd memory used outside of scope (alpha segfault).
+       - fix: define/eval options assumed sizeof(int) == sizeof(void *).
        
 3.0.3 -> 3.0.4
        - use compressed filenames on install side.

diff --git a/rpm.c b/rpm.c
index fbc7fdd..291903c 100755 (executable)
--- a/rpm.c
+++ b/rpm.c
@@ -117,10 +117,10 @@ static struct poptOption optionsTable[] = {
  { "build", 'b', POPT_ARG_STRING, 0, 'b',      NULL, NULL},
  { "checksig", 'K', 0, 0, 'K',                 NULL, NULL},
  { "dbpath", '\0', POPT_ARG_STRING, 0, GETOPT_DBPATH,          NULL, NULL},
- { "define", '\0', POPT_ARG_STRING, &noUsageMsg, GETOPT_DEFINEMACRO,NULL, NULL},
+ { "define", '\0', POPT_ARG_STRING, 0, GETOPT_DEFINEMACRO,NULL, NULL},
  { "dirtokens", '\0', POPT_ARG_VAL, &_noDirTokens, 0,  NULL, NULL},
  { "erase", 'e', 0, 0, 'e',                    NULL, NULL},
- { "eval", '\0', POPT_ARG_STRING, &noUsageMsg, GETOPT_EVALMACRO, NULL, NULL},
+ { "eval", '\0', POPT_ARG_STRING, 0, GETOPT_EVALMACRO, NULL, NULL},
  { "excludedocs", '\0', 0, &excldocs, 0,       NULL, NULL},
  { "excludepath", '\0', POPT_ARG_STRING, 0, GETOPT_EXCLUDEPATH,        NULL, NULL},
  { "force", '\0', 0, &force, 0,                        NULL, NULL},
@@ -851,12 +851,14 @@ int main(int argc, const char ** argv)
          case GETOPT_DEFINEMACRO:
            rpmDefineMacro(NULL, optArg, RMIL_CMDLINE);
            rpmDefineMacro(&rpmCLIMacroContext, optArg, RMIL_CMDLINE);
+           noUsageMsg = 1;
            break;
 
          case GETOPT_EVALMACRO:
          { const char *val = rpmExpand(optArg, NULL);
            fprintf(stdout, "%s\n", val);
            xfree(val);
+           noUsageMsg = 1;
          } break;
 
          case GETOPT_TIMECHECK: