rpms/mmv/devel mmv-1.01b-debian-14.patch, NONE, 1.1 changelog, 1.1, 1.2 mmv.spec, 1.3, 1.4
Zing Zing Shishak (shishz)
fedora-extras-commits at redhat.com
Tue Feb 14 01:19:57 UTC 2006
Author: shishz
Update of /cvs/extras/rpms/mmv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8689
Modified Files:
changelog mmv.spec
Added Files:
mmv-1.01b-debian-14.patch
Log Message:
* Mon Feb 13 2006 Zing <shishz at hotpop.com> - 1.01b-5
- sync with debian mmv_1.01b-14
- symlink man page for mcp/mad/mln
mmv-1.01b-debian-14.patch:
--- NEW FILE mmv-1.01b-debian-14.patch ---
--- mmv-1.01b.orig/mmv.c.orig 2006-02-13 19:07:32.000000000 -0500
+++ mmv-1.01b.orig/mmv.c 2006-02-13 19:11:34.000000000 -0500
@@ -439,7 +439,9 @@
static int badreps = 0, paterr = 0, direrr, failed = 0, gotsig = 0, repbad;
static FILE *outfile;
+#ifdef IS_MSDOS
static char IDF[] = "$$mmvdid.";
+#endif
static char TEMP[] = "$$mmvtmp.";
static char TOOLONG[] = "(too long)";
static char EMPTY[] = "(empty)";
@@ -457,12 +459,12 @@
char fullrep[MAXPATH + 1];
static char *(start[MAXWILD]);
static int len[MAXWILD];
-static char hasdot[MAXWILD];
static REP mistake;
#define MISTAKE (&mistake)
#ifdef IS_MSDOS
+static char hasdot[MAXWILD];
static int olddevflag, curdisk, maxdisk;
static struct {
char ph_banner[30];
@@ -627,7 +629,7 @@
}
endargs:
- if (op == DFLT)
+ if (op == DFLT) {
if (strcmp(cmdname, MOVENAME) == 0)
op = XMOVE;
else if (strcmp(cmdname, COPYNAME) == 0)
@@ -638,6 +640,8 @@
op = HARDLINK;
else
op = DFLTOP;
+ }
+
if (
op & DIRMOVE &&
#ifdef IS_MSDOS
@@ -784,7 +788,7 @@
static int parsepat()
{
char *p, *lastname, c;
- int totwilds, instage, x, havedot;
+ int totwilds, instage, x;
static char TRAILESC[] = "%s -> %s : trailing %c is superfluous.\n";
lastname = from;
@@ -1047,7 +1051,7 @@
DIRINFO *di;
HANDLE *h, *hto;
int prelen, litlen, nfils, i, k, flags, try;
- FILEINFO **pf, *fdel;
+ FILEINFO **pf, *fdel = NULL;
char *nto, *firstesc;
REP *p;
int wantdirs, ret = 1, laststage = (stage + 1 == nstages);
@@ -1177,11 +1181,12 @@
if (*p == '.' || (!matchall && ffrom->fi_attrib & (FA_HIDDEN | FA_SYSTEM)))
return(strcmp(pat, p) == 0);
#else
- if (*p == '.')
+ if (*p == '.') {
if (p[1] == '\0' || (p[1] == '.' && p[2] == '\0'))
return(strcmp(pat, p) == 0);
else if (!matchall && *pat != '.')
return(0);
+ }
#endif
return(-1);
}
@@ -1317,7 +1322,7 @@
{
char tpath[MAXPATH + 1];
char *pathend;
- FILEINFO *fdel;
+ FILEINFO *fdel = NULL;
int hlen, tlen;
if (op & DIRMOVE) {
@@ -1410,7 +1415,9 @@
static int badname(s)
char *s;
{
+#ifdef IS_MSDOS
char *ext;
+#endif
return (
#ifdef IS_MSDOS
@@ -1720,20 +1727,19 @@
struct stat dstat;
DIRID d;
DEVID v;
- DIRINFO **newdirs, *di;
- int nfils;
- FILEINFO **fils;
+ DIRINFO *di = NULL;
char *myp, *lastslash = NULL;
int sticky;
HANDLE *h;
- if (hsearch(p, which, &h))
+ if (hsearch(p, which, &h)) {
if (h->h_di == NULL) {
direrr = h->h_err;
return(NULL);
}
else
return(h);
+ }
if (*p == '\0')
myp = ".";
@@ -1904,7 +1910,10 @@
char *pat, *s, **start1;
int *len1;
{
- char c, *olds;
+ char c;
+#ifdef IS_MSDOS
+ char *olds;
+#endif
*start1 = 0;
for(;;)
@@ -2381,9 +2390,9 @@
static void doreps()
{
char *fstart;
- int k, printaliased = 0, alias;
+ int k, printaliased = 0, alias = 0;
REP *first, *p;
- long aliaslen;
+ long aliaslen = 0l;
#ifdef IS_MSDOS
ctrlbrk(breakrep);
@@ -2401,11 +2410,12 @@
}
strcpy(fullrep, p->r_hto->h_name);
strcat(fullrep, p->r_nto);
- if (!noex && (p->r_flags & R_ISCYCLE))
+ if (!noex && (p->r_flags & R_ISCYCLE)) {
if (op & APPEND)
aliaslen = appendalias(first, p, &printaliased);
else
alias = movealias(first, p, &printaliased);
+ }
strcpy(pathbuf, p->r_hfrom->h_name);
fstart = pathbuf + strlen(pathbuf);
if ((p->r_flags & R_ISALIASED) && !(op & APPEND))
@@ -2464,7 +2474,7 @@
REP *first, *p;
int *pprintaliased;
{
- long ret;
+ long ret = 0l;
#ifdef IS_MSDOS
int fd;
@@ -2631,9 +2641,10 @@
FILEINFO *ff;
off_t len;
{
- char buf[BUFSIZE], c;
+ char buf[BUFSIZE];
int f, t, k, mode, perm;
#ifdef IS_MSDOS
+ char c;
struct ftime tim;
#else
#ifdef IS_SYSV
Index: changelog
===================================================================
RCS file: /cvs/extras/rpms/mmv/devel/changelog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- changelog 30 Sep 2005 00:40:20 -0000 1.1
+++ changelog 14 Feb 2006 01:19:57 -0000 1.2
@@ -1,3 +1,18 @@
+mmv (1.01b-14) unstable; urgency=low
+
+ * Thanks for NMU to Joey, Ai and Uwe
+ * applied Patch to initialize var (Closes: Bug #316363)
+ * removed 2 dozent GCC warnings (uninitialized, unused, ambiquous else)
+
+ -- Bernd Eckenfels <ecki at debian.org> Sat, 04 Feb 2006 23:58:43 +0100
+
+mmv (1.01b-12.3) unstable; urgency=low
+
+ * NMU
+ * Remove postinst and prerm, finishing /usr/doc transition. Closes: #322813
+
+ -- Joey Hess <joeyh at debian.org> Tue, 10 Jan 2006 00:54:51 -0500
+
mmv (1.01b-12.2) unstable; urgency=low
* NMU
Index: mmv.spec
===================================================================
RCS file: /cvs/extras/rpms/mmv/devel/mmv.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mmv.spec 1 Oct 2005 23:22:17 -0000 1.3
+++ mmv.spec 14 Feb 2006 01:19:57 -0000 1.4
@@ -1,6 +1,6 @@
Name: mmv
Version: 1.01b
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Move/copy/append/link multiple files
Group: Applications/File
@@ -11,6 +11,7 @@
Source2: changelog
Patch0: mmv-1.01b-debian.patch
Patch1: mmv-1.01b-makefile.patch
+Patch2: mmv-1.01b-debian-14.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
@@ -27,6 +28,7 @@
%setup -q -n mmv-1.01b.orig
%patch0 -p1
%patch1 -p1
+%patch2 -p1
cp -p %{SOURCE1} .
cp -p %{SOURCE2} .
@@ -39,6 +41,9 @@
ln -s mmv $RPM_BUILD_ROOT/%{_bindir}/mcp
ln -s mmv $RPM_BUILD_ROOT/%{_bindir}/mad
ln -s mmv $RPM_BUILD_ROOT/%{_bindir}/mln
+ln -s mmv.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/mcp.1.gz
+ln -s mmv.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/mad.1.gz
+ln -s mmv.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/mln.1.gz
%clean
rm -rf $RPM_BUILD_ROOT
@@ -53,6 +58,10 @@
%{_mandir}/man1/*
%changelog
+* Mon Feb 13 2006 Zing <shishz at hotpop.com> - 1.01b-5
+- sync with debian mmv_1.01b-14
+- symlink man page for mcp/mad/mln
+
* Sat Oct 1 2005 Zing <shishz at hotpop.com> - 1.01b-4
- use dist tag
More information about the fedora-extras-commits
mailing list