*/
#include <h/mh.h>
+#include <h/utils.h>
#include <errno.h>
static struct swit switches[] = {
{ NULL, 0 }
};
-extern int errno;
-
static int fshort = 0; /* output only folder names */
static int fcreat = 0; /* should we ask to create new folders? */
static int fpack = 0; /* are we packing the folder? */
static void dodir (char *);
static int get_folder_info (char *, char *);
static void print_folders (void);
-static int num_digits (int);
static int sfold (struct msgs *, char *);
static void addir (char *);
static void addfold (char *);
int pushsw = 0, popsw = 0;
char *cp, *dp, *msg = NULL, *argfolder = NULL;
char **ap, **argp, buf[BUFSIZ], **arguments;
- struct stat st;
#ifdef LOCALE
setlocale(LC_ALL, "");
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!");
/* Allocate initial space to record folder names */
maxfolders = NUMFOLDERS;
- if ((folds = malloc (maxfolders * sizeof(char *))) == NULL)
- adios (NULL, "unable to allocate storage for folder names");
+ folds = mh_xmalloc (maxfolders * sizeof(char *));
/* Allocate initial space to record folder information */
maxFolderInfo = NUMFOLDERS;
- if ((fi = malloc (maxFolderInfo * sizeof(*fi))) == NULL)
- adios (NULL, "unable to allocate storage for folder info");
+ fi = mh_xmalloc (maxFolderInfo * sizeof(*fi));
/*
* Scan the folders
* Check if folder exists. If not, then see if
* we should create it, or just exit.
*/
- if (stat (strncpy (buf, m_maildir (folder), sizeof(buf)), &st) == -1) {
- if (errno != ENOENT)
- adios (buf, "error on folder");
- if (fcreat == 0) {
- /* ask before creating folder */
- cp = concat ("Create folder \"", buf, "\"? ", NULL);
- if (!getanswer (cp))
- done (1);
- free (cp);
- } else if (fcreat == -1) {
- /* do not create, so exit */
- done (1);
- }
- if (!makedir (buf))
- adios (NULL, "unable to create folder %s", buf);
- }
+ create_folder (m_maildir (folder), fcreat, done);
if (get_folder_info (folder, msg) && argfolder) {
/* update current folder */
print_folders();
context_save (); /* save the context file */
- return done (0);
+ done (0);
+ return 1;
}
/*
int i;
int os = start;
int of = foldp;
- char buffer[BUFSIZ];
start = foldp;
if (chdir (nmhdir) == NOTOK)
adios (nmhdir, "unable to change directory to");
- addir (strncpy (buffer, dir, sizeof(buffer)));
+ addir (dir);
for (i = start; i < foldp; i++) {
get_folder_info (folds[i], NULL);
*/
if (total_folders >= maxFolderInfo) {
maxFolderInfo += NUMFOLDERS;
- if ((fi = realloc (fi, maxFolderInfo * sizeof(*fi))) == NULL)
- adios (NULL, "unable to re-allocate storage for folder info");
+ fi = mh_xrealloc (fi, maxFolderInfo * sizeof(*fi));
}
fi[i].name = fold;
}
/*
- * Calculate the number of digits in a nonnegative integer
- */
-int
-num_digits (int n)
-{
- int ndigits = 0;
-
- /* Sanity check */
- if (n < 0)
- adios (NULL, "oops, num_digits called with negative value");
-
- if (n == 0)
- return 1;
-
- while (n) {
- n /= 10;
- ndigits++;
- }
-
- return ndigits;
-}
-
-/*
* Set the current message and sychronize sequences
*/
addir (char *name)
{
int nlink;
- char *base, *cp;
+ char *prefix, *child;
struct stat st;
struct dirent *dp;
DIR * dd;
- cp = name + strlen (name);
- *cp++ = '/';
- *cp = '\0';
-
- /*
- * A hack to skip over a leading
- * "./" in folder names.
- */
- base = strcmp (name, "./") ? name : name + 2;
-
/* short-cut to see if directory has any sub-directories */
if (stat (name, &st) != -1 && st.st_nlink == 2)
return;
return;
}
+ if (strcmp (name, ".") == 0) {
+ prefix = getcpy ("");
+ } else {
+ prefix = concat (name, "/", (void *)NULL);
+ }
+
/*
* Keep track of the number of directories we've seen
* so we can quit stat'ing early, if we've seen them all.
nlink--;
continue;
}
- if (cp + NLENGTH(dp) + 2 >= name + BUFSIZ)
- continue;
- strcpy (cp, dp->d_name);
- if (stat (name, &st) != -1 && S_ISDIR(st.st_mode)) {
+ child = concat (prefix, dp->d_name, (void *)NULL);
+ if (stat (child, &st) != -1 && S_ISDIR(st.st_mode)) {
/*
* Check if this was really a symbolic link pointing at
* a directory. If not, then decrement link count.
*/
- if (lstat (name, &st) == -1)
+ if (lstat (child, &st) == -1)
nlink--;
- addfold (base);
+ /* addfold saves child in the list, don't free it */
+ addfold (child);
+ } else {
+ free (child);
}
}
closedir (dd);
- *--cp = '\0';
+ free(prefix);
}
/*
addfold (char *fold)
{
register int i, j;
- register char *cp;
/* if necessary, reallocate the space for folder names */
if (foldp >= maxfolders) {
maxfolders += NUMFOLDERS;
- if ((folds = realloc (folds, maxfolders * sizeof(char *))) == NULL)
- adios (NULL, "unable to re-allocate storage for folder names");
+ folds = mh_xrealloc (folds, maxfolders * sizeof(char *));
}
- cp = getcpy (fold);
for (i = start; i < foldp; i++)
- if (compare (cp, folds[i]) < 0) {
+ if (compare (fold, folds[i]) < 0) {
for (j = foldp - 1; j >= i; j--)
folds[j + 1] = folds[j];
foldp++;
- folds[i] = cp;
+ folds[i] = fold;
return;
}
- folds[foldp++] = cp;
+ folds[foldp++] = fold;
}
projects / mmh / blobdiff