RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 21-Mar-2010 01:30:20
Branch: HEAD Handle: 2010032100302000
Modified files:
rpm/tools cp.c
Log:
- cp: fix: resolve the tedious -R <-> -r issue by having it both ways.
Summary:
Revision Changes Path
2.21 +3 -1 rpm/tools/cp.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/tools/cp.c
============================================================================
$ cvs diff -u -r2.20 -r2.21 cp.c
--- rpm/tools/cp.c 9 Jan 2010 22:04:15 -0000 2.20
+++ rpm/tools/cp.c 21 Mar 2010 00:30:20 -0000 2.21
@@ -803,7 +803,7 @@
/*...@unchecked@*/ /*...@observer@*/
static struct poptOption optionsTable[] = {
/*...@-type@*/ /* FIX: cast? */
- { NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA |
POPT_CBFLAG_CONTINUE,
+ { NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA,
copyArgCallback, 0, NULL, NULL },
/*...@=type@*/
@@ -815,6 +815,8 @@
N_("Never follow symbolic links"), NULL },
{ "recursive",'R', POPT_ARG_NONE, NULL, (int)'R',
N_("Copy directories recursively"), NULL },
+ { "recursive",'r', POPT_ARG_NONE|POPT_ARGFLAG_DOC_HIDDEN, NULL, (int)'R',
+ N_("Copy directories recursively"), NULL },
{ "archive",'a', POPT_ARG_NONE, NULL, (int)'a',
N_("Archive mode (same as -RpP)"), NULL },
{ "force",'f', POPT_ARG_NONE, NULL, (int)'f',
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
