[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Nmh-commits] nmh h/prototypes.h sbr/path.c uip/anno.c uip/bu...
|
From: |
Joel Reicher |
|
Subject: |
[Nmh-commits] nmh h/prototypes.h sbr/path.c uip/anno.c uip/bu... |
|
Date: |
Thu, 27 Apr 2006 12:00:29 +0000 |
CVSROOT: /sources/nmh
Module name: nmh
Branch:
Changes by: Joel Reicher <address@hidden> 06/04/27 12:00:28
Modified files:
h : prototypes.h
sbr : path.c
uip : anno.c burst.c comp.c dist.c flist.c folder.c
forw.c inc.c mark.c mhbuildsbr.c mhlist.c mhn.c
mhpath.c mhshow.c mhstore.c mhstoresbr.c
mhtest.c msh.c mshcmds.c packf.c pick.c popi.c
rcvstore.c refile.c repl.c rmf.c rmm.c scan.c
show.c sortm.c
Log message:
Created pluspath function to check for '+' prefix and change flag for
path() appropriately. This eliminates some duplicate prefix processing,
but not all. The path functions need to be restructed; this is the first
step.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/h/prototypes.h.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/sbr/path.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/anno.c.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/burst.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/comp.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/dist.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/flist.c.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/folder.c.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/forw.c.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/inc.c.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/mark.c.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/mhbuildsbr.c.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/mhlist.c.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/mhn.c.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/mhpath.c.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/mhshow.c.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/mhstore.c.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/mhstoresbr.c.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/mhtest.c.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/msh.c.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/mshcmds.c.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/packf.c.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/pick.c.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/popi.c.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/rcvstore.c.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/refile.c.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/repl.c.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/rmf.c.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/rmm.c.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/scan.c.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/show.c.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/sortm.c.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
Patches:
Index: nmh/h/prototypes.h
diff -u nmh/h/prototypes.h:1.16 nmh/h/prototypes.h:1.17
--- nmh/h/prototypes.h:1.16 Wed Mar 8 12:14:16 2006
+++ nmh/h/prototypes.h Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* prototypes.h -- various prototypes
*
- * $Id: prototypes.h,v 1.16 2006/03/08 12:14:16 bress Exp $
+ * $Id: prototypes.h,v 1.17 2006/04/27 12:00:28 jjr Exp $
*/
/*
@@ -89,6 +89,7 @@
int peekc(FILE *ib);
int pidwait (pid_t, int);
int pidstatus (int, FILE *, char *);
+char *pluspath(char *);
void print_help (char *, struct swit *, int);
void print_sw (char *, struct swit *, char *);
void print_version (char *);
Index: nmh/sbr/path.c
diff -u nmh/sbr/path.c:1.2 nmh/sbr/path.c:1.3
--- nmh/sbr/path.c:1.2 Tue Jul 2 22:09:14 2002
+++ nmh/sbr/path.c Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* path.c -- return a pathname
*
- * $Id: path.c,v 1.2 2002/07/02 22:09:14 kenh Exp $
+ * $Id: path.c,v 1.3 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -26,6 +26,11 @@
static char *expath(char *,int);
static void compath(char *);
+char *
+pluspath(char *name)
+{
+ return path(name + 1, *name == '+' ? TFOLDER : TSUBCWF);
+}
char *
path(char *name, int flag)
Index: nmh/uip/anno.c
diff -u nmh/uip/anno.c:1.9 nmh/uip/anno.c:1.10
--- nmh/uip/anno.c:1.9 Tue Apr 11 14:09:11 2006
+++ nmh/uip/anno.c Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* anno.c -- annotate messages
*
- * $Id: anno.c,v 1.9 2006/04/11 14:09:11 jjr Exp $
+ * $Id: anno.c,v 1.10 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -211,7 +211,7 @@
if (folder)
adios (NULL, "only one folder at a time!");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
} else
app_msgarg(&msgs, cp);
}
Index: nmh/uip/burst.c
diff -u nmh/uip/burst.c:1.5 nmh/uip/burst.c:1.6
--- nmh/uip/burst.c:1.5 Fri Aug 23 20:37:01 2002
+++ nmh/uip/burst.c Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* burst.c -- explode digests into individual messages
*
- * $Id: burst.c,v 1.5 2002/08/23 20:37:01 jon Exp $
+ * $Id: burst.c,v 1.6 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -111,7 +111,7 @@
if (folder)
adios (NULL, "only one folder at a time!");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
} else {
msgs[msgp++] = cp;
}
Index: nmh/uip/comp.c
diff -u nmh/uip/comp.c:1.5 nmh/uip/comp.c:1.6
--- nmh/uip/comp.c:1.5 Fri Apr 14 14:10:16 2006
+++ nmh/uip/comp.c Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* comp.c -- compose a message
*
- * $Id: comp.c,v 1.5 2006/04/14 14:10:16 jjr Exp $
+ * $Id: comp.c,v 1.6 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -172,7 +172,7 @@
if (folder)
adios (NULL, "only one folder at a time!");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
} else {
if (msg)
adios (NULL, "only one message at a time!");
Index: nmh/uip/dist.c
diff -u nmh/uip/dist.c:1.5 nmh/uip/dist.c:1.6
--- nmh/uip/dist.c:1.5 Fri Apr 14 14:10:16 2006
+++ nmh/uip/dist.c Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* dist.c -- re-distribute a message
*
- * $Id: dist.c,v 1.5 2006/04/14 14:10:16 jjr Exp $
+ * $Id: dist.c,v 1.6 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -180,7 +180,7 @@
if (folder)
adios (NULL, "only one folder at a time!");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
} else {
if (msg)
adios (NULL, "only one message at a time!");
Index: nmh/uip/flist.c
diff -u nmh/uip/flist.c:1.9 nmh/uip/flist.c:1.10
--- nmh/uip/flist.c:1.9 Tue Feb 21 01:11:51 2006
+++ nmh/uip/flist.c Thu Apr 27 12:00:28 2006
@@ -13,7 +13,7 @@
* makes no warranty about the software, its performance or its conformity to
* any specification.
*
- * $Id: flist.c,v 1.9 2006/02/21 01:11:51 bress Exp $
+ * $Id: flist.c,v 1.10 2006/04/27 12:00:28 jjr Exp $
*/
#include <h/mh.h>
@@ -232,7 +232,7 @@
}
if (*cp == '+' || *cp == '@') {
foldersToDo[numfolders++] =
- path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ pluspath (cp);
} else
foldersToDo[numfolders++] = cp;
}
Index: nmh/uip/folder.c
diff -u nmh/uip/folder.c:1.11 nmh/uip/folder.c:1.12
--- nmh/uip/folder.c:1.11 Fri Apr 14 07:54:26 2006
+++ nmh/uip/folder.c Thu Apr 27 12:00:28 2006
@@ -4,7 +4,7 @@
* -- push/pop a folder onto/from the folder stack
* -- list the folder stack
*
- * $Id: folder.c,v 1.11 2006/04/14 07:54:26 jjr Exp $
+ * $Id: folder.c,v 1.12 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -259,7 +259,7 @@
if (argfolder)
adios (NULL, "only one folder at a time!");
else
- argfolder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ argfolder = pluspath (cp);
} else {
if (msg)
adios (NULL, "only one (current) message at a time!");
Index: nmh/uip/forw.c
diff -u nmh/uip/forw.c:1.8 nmh/uip/forw.c:1.9
--- nmh/uip/forw.c:1.8 Fri Apr 14 14:10:16 2006
+++ nmh/uip/forw.c Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* forw.c -- forward a message, or group of messages.
*
- * $Id: forw.c,v 1.8 2006/04/14 14:10:16 jjr Exp $
+ * $Id: forw.c,v 1.9 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -285,7 +285,7 @@
if (folder)
adios (NULL, "only one folder at a time!");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
} else {
msgs[msgp++] = cp;
}
Index: nmh/uip/inc.c
diff -u nmh/uip/inc.c:1.22 nmh/uip/inc.c:1.23
--- nmh/uip/inc.c:1.22 Fri Apr 14 07:54:26 2006
+++ nmh/uip/inc.c Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* inc.c -- incorporate messages from a maildrop into a folder
*
- * $Id: inc.c,v 1.22 2006/04/14 07:54:26 jjr Exp $
+ * $Id: inc.c,v 1.23 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -457,7 +457,7 @@
if (folder)
adios (NULL, "only one folder at a time!");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
} else {
adios (NULL, "usage: %s [+folder] [switches]", invo_name);
}
Index: nmh/uip/mark.c
diff -u nmh/uip/mark.c:1.7 nmh/uip/mark.c:1.8
--- nmh/uip/mark.c:1.7 Tue Apr 11 14:09:11 2006
+++ nmh/uip/mark.c Thu Apr 27 12:00:28 2006
@@ -4,7 +4,7 @@
* -- delete messages (s) from sequences in given folder
* -- list sequences in given folder
*
- * $Id: mark.c,v 1.7 2006/04/11 14:09:11 jjr Exp $
+ * $Id: mark.c,v 1.8 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -137,7 +137,7 @@
if (folder)
adios (NULL, "only one folder at a time!");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
} else
app_msgarg(&msgs, cp);
}
Index: nmh/uip/mhbuildsbr.c
diff -u nmh/uip/mhbuildsbr.c:1.14 nmh/uip/mhbuildsbr.c:1.15
--- nmh/uip/mhbuildsbr.c:1.14 Wed Mar 8 12:14:16 2006
+++ nmh/uip/mhbuildsbr.c Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* mhbuildsbr.c -- routines to expand/translate MIME composition files
*
- * $Id: mhbuildsbr.c,v 1.14 2006/03/08 12:14:16 bress Exp $
+ * $Id: mhbuildsbr.c,v 1.15 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -3254,7 +3254,7 @@
if (folder)
adios (NULL, "only one folder per #forw directive");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
}
}
Index: nmh/uip/mhlist.c
diff -u nmh/uip/mhlist.c:1.11 nmh/uip/mhlist.c:1.12
--- nmh/uip/mhlist.c:1.11 Tue Apr 11 14:09:11 2006
+++ nmh/uip/mhlist.c Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* mhlist.c -- list the contents of MIME messages
*
- * $Id: mhlist.c,v 1.11 2006/04/11 14:09:11 jjr Exp $
+ * $Id: mhlist.c,v 1.12 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -242,7 +242,7 @@
if (folder)
adios (NULL, "only one folder at a time!");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
} else
app_msgarg(&msgs, cp);
}
Index: nmh/uip/mhn.c
diff -u nmh/uip/mhn.c:1.11 nmh/uip/mhn.c:1.12
--- nmh/uip/mhn.c:1.11 Tue Apr 11 14:09:11 2006
+++ nmh/uip/mhn.c Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* mhn.c -- display, list, cache, or store the contents of MIME messages
*
- * $Id: mhn.c,v 1.11 2006/04/11 14:09:11 jjr Exp $
+ * $Id: mhn.c,v 1.12 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -427,7 +427,7 @@
if (folder)
adios (NULL, "only one folder at a time!");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
} else
app_msgarg(&msgs, cp);
}
Index: nmh/uip/mhpath.c
diff -u nmh/uip/mhpath.c:1.7 nmh/uip/mhpath.c:1.8
--- nmh/uip/mhpath.c:1.7 Tue Apr 11 14:09:11 2006
+++ nmh/uip/mhpath.c Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* mhpath.c -- print full pathnames of nmh messages and folders
*
- * $Id: mhpath.c,v 1.7 2006/04/11 14:09:11 jjr Exp $
+ * $Id: mhpath.c,v 1.8 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -67,7 +67,7 @@
if (folder)
adios (NULL, "only one folder at a time!");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
} else
app_msgarg(&msgs, cp);
}
Index: nmh/uip/mhshow.c
diff -u nmh/uip/mhshow.c:1.11 nmh/uip/mhshow.c:1.12
--- nmh/uip/mhshow.c:1.11 Tue Apr 11 14:09:11 2006
+++ nmh/uip/mhshow.c Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* mhshow.c -- display the contents of MIME messages
*
- * $Id: mhshow.c,v 1.11 2006/04/11 14:09:11 jjr Exp $
+ * $Id: mhshow.c,v 1.12 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -283,7 +283,7 @@
if (folder)
adios (NULL, "only one folder at a time!");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
} else
app_msgarg(&msgs, cp);
}
Index: nmh/uip/mhstore.c
diff -u nmh/uip/mhstore.c:1.11 nmh/uip/mhstore.c:1.12
--- nmh/uip/mhstore.c:1.11 Tue Apr 11 14:09:11 2006
+++ nmh/uip/mhstore.c Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* mhstore.c -- store the contents of MIME messages
*
- * $Id: mhstore.c,v 1.11 2006/04/11 14:09:11 jjr Exp $
+ * $Id: mhstore.c,v 1.12 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -229,7 +229,7 @@
if (folder)
adios (NULL, "only one folder at a time!");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
} else
app_msgarg(&msgs, cp);
}
Index: nmh/uip/mhstoresbr.c
diff -u nmh/uip/mhstoresbr.c:1.13 nmh/uip/mhstoresbr.c:1.14
--- nmh/uip/mhstoresbr.c:1.13 Wed Mar 8 12:14:16 2006
+++ nmh/uip/mhstoresbr.c Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* mhstoresbr.c -- routines to save/store the contents of MIME messages
*
- * $Id: mhstoresbr.c,v 1.13 2006/03/08 12:14:16 bress Exp $
+ * $Id: mhstoresbr.c,v 1.14 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -565,7 +565,7 @@
/* Get the folder name */
if (cp[1])
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
else
folder = getfolder (1);
Index: nmh/uip/mhtest.c
diff -u nmh/uip/mhtest.c:1.11 nmh/uip/mhtest.c:1.12
--- nmh/uip/mhtest.c:1.11 Tue Apr 11 14:09:11 2006
+++ nmh/uip/mhtest.c Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* mhtest.c -- test harness for MIME routines
*
- * $Id: mhtest.c,v 1.11 2006/04/11 14:09:11 jjr Exp $
+ * $Id: mhtest.c,v 1.12 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -230,7 +230,7 @@
if (folder)
adios (NULL, "only one folder at a time!");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
} else
app_msgarg(&msgs, cp);
}
Index: nmh/uip/msh.c
diff -u nmh/uip/msh.c:1.10 nmh/uip/msh.c:1.11
--- nmh/uip/msh.c:1.10 Wed Mar 8 12:14:16 2006
+++ nmh/uip/msh.c Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* msh.c -- The nmh shell
*
- * $Id: msh.c,v 1.10 2006/03/08 12:14:16 bress Exp $
+ * $Id: msh.c,v 1.11 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -351,7 +351,7 @@
if (folder)
adios (NULL, "only one folder at a time!");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
}
else
if (file)
Index: nmh/uip/mshcmds.c
diff -u nmh/uip/mshcmds.c:1.14 nmh/uip/mshcmds.c:1.15
--- nmh/uip/mshcmds.c:1.14 Wed Mar 8 12:14:16 2006
+++ nmh/uip/mshcmds.c Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* mshcmds.c -- command handlers in msh
*
- * $Id: mshcmds.c,v 1.14 2006/03/08 12:14:16 bress Exp $
+ * $Id: mshcmds.c,v 1.15 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -593,7 +593,7 @@
if (cwd == NULL)
cwd = getcpy (pwd ());
chdir (m_maildir (""));
- cp = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ cp = pluspath (cp);
if (access (m_maildir (cp), F_OK) == NOTOK)
result = OK;
free (cp);
@@ -703,7 +703,7 @@
return;
}
else
- folder = fmsh ? path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF)
+ folder = fmsh ? pluspath (cp)
: cp + 1;
}
else
Index: nmh/uip/packf.c
diff -u nmh/uip/packf.c:1.8 nmh/uip/packf.c:1.9
--- nmh/uip/packf.c:1.8 Tue Apr 11 14:09:11 2006
+++ nmh/uip/packf.c Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* packf.c -- pack a nmh folder into a file
*
- * $Id: packf.c,v 1.8 2006/04/11 14:09:11 jjr Exp $
+ * $Id: packf.c,v 1.9 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -98,7 +98,7 @@
if (*cp == '+' || *cp == '@') {
if (folder)
adios (NULL, "only one folder at a time!");
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
} else
app_msgarg(&msgs, cp);
}
Index: nmh/uip/pick.c
diff -u nmh/uip/pick.c:1.9 nmh/uip/pick.c:1.10
--- nmh/uip/pick.c:1.9 Tue Apr 11 14:09:11 2006
+++ nmh/uip/pick.c Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* pick.c -- search for messages by content
*
- * $Id: pick.c,v 1.9 2006/04/11 14:09:11 jjr Exp $
+ * $Id: pick.c,v 1.10 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -177,7 +177,7 @@
if (folder)
adios (NULL, "only one folder at a time!");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
} else
app_msgarg(&msgs, cp);
}
Index: nmh/uip/popi.c
diff -u nmh/uip/popi.c:1.10 nmh/uip/popi.c:1.11
--- nmh/uip/popi.c:1.10 Mon Feb 20 03:09:08 2006
+++ nmh/uip/popi.c Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* popi.c -- POP initiator for MPOP
*
- * $Id: popi.c,v 1.10 2006/02/20 03:09:08 bress Exp $
+ * $Id: popi.c,v 1.11 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -191,7 +191,7 @@
if (folder)
adios (NULL, "only one folder at a time!");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
}
else
adios (NULL, "usage: %s [+folder] [switches]", invo_name);
Index: nmh/uip/rcvstore.c
diff -u nmh/uip/rcvstore.c:1.10 nmh/uip/rcvstore.c:1.11
--- nmh/uip/rcvstore.c:1.10 Fri Nov 19 05:06:16 2004
+++ nmh/uip/rcvstore.c Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* rcvstore.c -- asynchronously add mail to a folder
*
- * $Id: rcvstore.c,v 1.10 2004/11/19 05:06:16 jon Exp $
+ * $Id: rcvstore.c,v 1.11 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -134,7 +134,7 @@
if (folder)
adios (NULL, "only one folder at a time!");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
} else {
adios (NULL, "usage: %s [+folder] [switches]", invo_name);
}
Index: nmh/uip/refile.c
diff -u nmh/uip/refile.c:1.12 nmh/uip/refile.c:1.13
--- nmh/uip/refile.c:1.12 Fri Apr 14 07:54:26 2006
+++ nmh/uip/refile.c Thu Apr 27 12:00:28 2006
@@ -3,7 +3,7 @@
* refile.c -- move or link message(s) from a source folder
* -- into one or more destination folders
*
- * $Id: refile.c,v 1.12 2006/04/14 07:54:26 jjr Exp $
+ * $Id: refile.c,v 1.13 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -163,7 +163,7 @@
if (foldp > NFOLDERS)
adios (NULL, "only %d folders allowed!", NFOLDERS);
folders[foldp++].f_name =
- path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ pluspath (cp);
} else
app_msgarg(&msgs, cp);
}
Index: nmh/uip/repl.c
diff -u nmh/uip/repl.c:1.7 nmh/uip/repl.c:1.8
--- nmh/uip/repl.c:1.7 Fri Jan 6 21:51:44 2006
+++ nmh/uip/repl.c Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* repl.c -- reply to a message
*
- * $Id: repl.c,v 1.7 2006/01/06 21:51:44 bress Exp $
+ * $Id: repl.c,v 1.8 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -319,7 +319,7 @@
if (folder)
adios (NULL, "only one folder at a time!");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
} else {
if (msg)
adios (NULL, "only one message at a time!");
Index: nmh/uip/rmf.c
diff -u nmh/uip/rmf.c:1.7 nmh/uip/rmf.c:1.8
--- nmh/uip/rmf.c:1.7 Mon Nov 14 00:18:24 2005
+++ nmh/uip/rmf.c Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* rmf.c -- remove a folder
*
- * $Id: rmf.c,v 1.7 2005/11/14 00:18:24 pm215 Exp $
+ * $Id: rmf.c,v 1.8 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -78,7 +78,7 @@
if (folder)
adios (NULL, "only one folder at a time!");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
} else {
adios (NULL, "usage: %s [+folder] [switches]", invo_name);
}
Index: nmh/uip/rmm.c
diff -u nmh/uip/rmm.c:1.8 nmh/uip/rmm.c:1.9
--- nmh/uip/rmm.c:1.8 Tue Apr 11 14:09:11 2006
+++ nmh/uip/rmm.c Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* rmm.c -- remove a message(s)
*
- * $Id: rmm.c,v 1.8 2006/04/11 14:09:11 jjr Exp $
+ * $Id: rmm.c,v 1.9 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -77,7 +77,7 @@
if (folder)
adios (NULL, "only one folder at a time!");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
} else
app_msgarg(&msgs, cp);
}
Index: nmh/uip/scan.c
diff -u nmh/uip/scan.c:1.13 nmh/uip/scan.c:1.14
--- nmh/uip/scan.c:1.13 Tue Apr 11 14:09:11 2006
+++ nmh/uip/scan.c Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* scan.c -- display a one-line "scan" listing of folder or messages
*
- * $Id: scan.c,v 1.13 2006/04/11 14:09:11 jjr Exp $
+ * $Id: scan.c,v 1.14 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -155,7 +155,7 @@
if (folder)
adios (NULL, "only one folder at a time!");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
} else
app_msgarg(&msgs, cp);
}
Index: nmh/uip/show.c
diff -u nmh/uip/show.c:1.8 nmh/uip/show.c:1.9
--- nmh/uip/show.c:1.8 Wed Mar 8 12:14:16 2006
+++ nmh/uip/show.c Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* show.c -- show/list messages
*
- * $Id: show.c,v 1.8 2006/03/08 12:14:16 bress Exp $
+ * $Id: show.c,v 1.9 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -179,7 +179,7 @@
if (folder)
adios (NULL, "only one folder at a time!");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
} else {
if (mode != SHOW)
goto usage;
Index: nmh/uip/sortm.c
diff -u nmh/uip/sortm.c:1.12 nmh/uip/sortm.c:1.13
--- nmh/uip/sortm.c:1.12 Tue Apr 11 14:09:11 2006
+++ nmh/uip/sortm.c Thu Apr 27 12:00:28 2006
@@ -2,7 +2,7 @@
/*
* sortm.c -- sort messages in a folder by date/time
*
- * $Id: sortm.c,v 1.12 2006/04/11 14:09:11 jjr Exp $
+ * $Id: sortm.c,v 1.13 2006/04/27 12:00:28 jjr Exp $
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
@@ -160,7 +160,7 @@
if (folder)
adios (NULL, "only one folder at a time!");
else
- folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ folder = pluspath (cp);
} else
app_msgarg(&msgs, cp);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Nmh-commits] nmh h/prototypes.h sbr/path.c uip/anno.c uip/bu...,
Joel Reicher <=