RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
  Module: rpm                              Date:   29-Jul-2007 20:35:33
  Branch: HEAD                             Handle: 2007072919353300

  Modified files:
    rpm/tools               db_tool.c

  Log:
    ops, fix the dispatching for the sub-command usage

  Summary:
    Revision    Changes     Path
    2.2         +3  -5      rpm/tools/db_tool.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/tools/db_tool.c
  ============================================================================
  $ cvs diff -u -r2.1 -r2.2 db_tool.c
  --- rpm/tools/db_tool.c	26 Jul 2007 07:39:26 -0000	2.1
  +++ rpm/tools/db_tool.c	29 Jul 2007 18:35:33 -0000	2.2
  @@ -199,10 +199,8 @@
   /* dispatch tools */
   int main(int argc, char *argv[])
   {
  -    int i;
  +    int i, j, k, l;
       char *arg;
  -    int l;
  -    int k;
   
       /* 1. try to dispatch over program name ("db_load [...]") */
       arg = argv[0];
  @@ -225,8 +223,8 @@
               if (   strcmp(argv[1], main_dispatch[i].name) == 0
                   || (l == k-3 && strcmp(arg, main_dispatch[i].name+3) == 0)) {
                   argv[0] = main_dispatch[i].name;
  -                for (i = 3; i <= argc; i++)
  -                    argv[i-2] = argv[i-1];
  +                for (j = 3; j <= argc; j++)
  +                    argv[j-2] = argv[j-1];
                   argc--;
                   return (*(main_dispatch[i].main))(argc, argv);
               }
  @@ .