projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rolled version. Should have done it last time!
[mmh]
/
uip
/
flist.c
diff --git
a/uip/flist.c
b/uip/flist.c
index
0e2b161
..
408f608
100644
(file)
--- a/
uip/flist.c
+++ b/
uip/flist.c
@@
-58,7
+58,7
@@
static struct swit switches[] = {
#define VERSIONSW 13
{ "version", 0 },
#define HELPSW 14
#define VERSIONSW 13
{ "version", 0 },
#define HELPSW 14
- { "help", 4 },
+ { "help", 0 },
{ NULL, 0 }
};
{ NULL, 0 }
};
@@
-232,9
+232,11
@@
main(int argc, char **argv)
(size_t) (maxfolders * sizeof(*foldersToDo)))))
adios (NULL, "unable to reallocate folder name storage");
}
(size_t) (maxfolders * sizeof(*foldersToDo)))))
adios (NULL, "unable to reallocate folder name storage");
}
- if (*cp == '+')
- ++cp;
- foldersToDo[numfolders++] = cp;
+ if (*cp == '+' || *cp == '@') {
+ foldersToDo[numfolders++] =
+ path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+ } else
+ foldersToDo[numfolders++] = cp;
}
}
}
}
@@
-276,7
+278,7
@@
main(int argc, char **argv)
ScanFolders();
qsort(folders, nFolders, sizeof(struct Folder), (qsort_comp) CompareFolders);
PrintFolders();
ScanFolders();
qsort(folders, nFolders, sizeof(struct Folder), (qsort_comp) CompareFolders);
PrintFolders();
- done (0);
+ return done (0);
}
/*
}
/*
@@
-399,7
+401,7
@@
BuildFolderList(char *dirName, int searchdepth)
void
BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth)
{
void
BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth)
{
- char *base, name[PATH_MAX];
+ char *base, *n, name[PATH_MAX];
int nlinks;
DIR *dir;
struct dirent *dp;
int nlinks;
DIR *dir;
struct dirent *dp;
@@
-430,6
+432,12
@@
BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth)
}
if (dp->d_name[0] == '.')
continue;
}
if (dp->d_name[0] == '.')
continue;
+ /* Check to see if the name of the file is a number
+ * if it is, we assume it's a mail file and skip it
+ */
+ for (n = dp->d_name; *n && isdigit(*n); n++);
+ if (!*n)
+ continue;
strncpy (name, base, sizeof(name) - 2);
if (*base)
strcat(name, "/");
strncpy (name, base, sizeof(name) - 2);
if (*base)
strcat(name, "/");
@@
-695,10
+703,6
@@
do_readonly_folders (void)
char atrcur[BUFSIZ];
register struct node *np;
char atrcur[BUFSIZ];
register struct node *np;
- /* sanity check - check that context has been read */
- if (defpath == NULL)
- adios (NULL, "oops, context hasn't been read yet");
-
snprintf (atrcur, sizeof(atrcur), "atr-%s-", current);
atrlen = strlen (atrcur);
snprintf (atrcur, sizeof(atrcur), "atr-%s-", current);
atrlen = strlen (atrcur);