X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fscan.c;h=03a260bdb8a35ec330dc9184807e213a9a147675;hp=3a0e6c642cbbb44ca528480aabf2013f00b93bfe;hb=714b5c530ece27ea2835a313013f5b770163403c;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4 diff --git a/uip/scan.c b/uip/scan.c index 3a0e6c6..03a260b 100644 --- a/uip/scan.c +++ b/uip/scan.c @@ -57,7 +57,7 @@ void clear_screen(void); /* from termsbr.c */ int -main (int argc, char **argv) +main(int argc, char **argv) { int clearflag = 0, hdrflag = 0, ontty; int width = 0, revflag = 0; @@ -73,13 +73,13 @@ main (int argc, char **argv) #ifdef LOCALE setlocale(LC_ALL, ""); #endif - invo_name = r1bindex (argv[0], '/'); + invo_name = r1bindex(argv[0], '/'); /* read user profile/context */ context_read(); - mts_init (invo_name); - arguments = getarguments (invo_name, argc, argv, 1); + mts_init(invo_name); + arguments = getarguments(invo_name, argc, argv, 1); argp = arguments; /* @@ -87,20 +87,20 @@ main (int argc, char **argv) */ while ((cp = *argp++)) { if (*cp == '-') { - switch (smatch (++cp, switches)) { + switch (smatch(++cp, switches)) { case AMBIGSW: - ambigsw (cp, switches); - done (1); + ambigsw(cp, switches); + done(1); case UNKWNSW: - adios (NULL, "-%s unknown", cp); + adios(NULL, "-%s unknown", cp); case HELPSW: - snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name); - print_help (buf, switches, 1); - done (1); + snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name); + print_help(buf, switches, 1); + done(1); case VERSIONSW: print_version(invo_name); - done (1); + done(1); case CLRSW: clearflag++; @@ -111,13 +111,13 @@ main (int argc, char **argv) case FORMSW: if (!(form = *argp++) || *form == '-') - adios (NULL, "missing argument to %s", argp[-2]); + adios(NULL, "missing argument to %s", argp[-2]); format = NULL; continue; case FMTSW: if (!(format = *argp++) || *format == '-') - adios (NULL, "missing argument to %s", argp[-2]); + adios(NULL, "missing argument to %s", argp[-2]); form = NULL; continue; @@ -130,8 +130,8 @@ main (int argc, char **argv) case WIDTHSW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); - width = atoi (cp); + adios(NULL, "missing argument to %s", argp[-2]); + width = atoi(cp); continue; case REVSW: revflag++; @@ -142,62 +142,62 @@ main (int argc, char **argv) case FILESW: if (!(cp = *argp++) || (cp[0] == '-' && cp[1])) - adios (NULL, "missing argument to %s", argp[-2]); - if (strcmp (file = cp, "-")) - file = path (cp, TFILE); + adios(NULL, "missing argument to %s", argp[-2]); + if (strcmp(file = cp, "-")) + file = path(cp, TFILE); continue; } } if (*cp == '+' || *cp == '@') { if (folder) - adios (NULL, "only one folder at a time!"); + adios(NULL, "only one folder at a time!"); else - folder = pluspath (cp); + folder = pluspath(cp); } else app_msgarg(&msgs, cp); } - if (!context_find ("path")) - free (path ("./", TFOLDER)); + if (!context_find("path")) + free(path("./", TFOLDER)); /* ** Get new format string. Must be before chdir(). */ - nfs = new_fs (form, format, FORMAT); + nfs = new_fs(form, format, FORMAT); /* ** We are scanning a maildrop file */ if (file) { if (msgs.size) - adios (NULL, "\"msgs\" not allowed with -file"); + adios(NULL, "\"msgs\" not allowed with -file"); if (folder) - adios (NULL, "\"+folder\" not allowed with -file"); + adios(NULL, "\"+folder\" not allowed with -file"); /* check if "file" is really stdin */ - if (strcmp (file, "-") == 0) { + if (strcmp(file, "-") == 0) { in = stdin; file = "stdin"; } else { - if ((in = fopen (file, "r")) == NULL) - adios (file, "unable to open"); + if ((in = fopen(file, "r")) == NULL) + adios(file, "unable to open"); } #ifndef JLR if (hdrflag) { - printf ("FOLDER %s\t%s\n", file, dtimenow (1)); + printf("FOLDER %s\t%s\n", file, dtimenow(1)); } #endif /* JLR */ - m_unknown (in); + m_unknown(in); for (msgnum = 1; ; ++msgnum) { - state = scan (in, msgnum, -1, nfs, width, 0, 0, + state = scan(in, msgnum, -1, nfs, width, 0, 0, hdrflag ? file : NULL, 0L, 1); if (state != SCNMSG && state != SCNENC) break; } - fclose (in); - done (0); + fclose(in); + done(0); } /* @@ -207,48 +207,48 @@ main (int argc, char **argv) if (!msgs.size) app_msgarg(&msgs, "all"); if (!folder) - folder = getfolder (1); - maildir = m_maildir (folder); + folder = getfolder(1); + maildir = m_maildir(folder); - if (chdir (maildir) == NOTOK) - adios (maildir, "unable to change directory to"); + if (chdir(maildir) == NOTOK) + adios(maildir, "unable to change directory to"); /* read folder and create message structure */ - if (!(mp = folder_read (folder))) - adios (NULL, "unable to read folder %s", folder); + if (!(mp = folder_read(folder))) + adios(NULL, "unable to read folder %s", folder); /* check for empty folder */ if (mp->nummsg == 0) - adios (NULL, "no messages in %s", folder); + adios(NULL, "no messages in %s", folder); /* parse all the message ranges/sequences and set SELECTED */ for (msgnum = 0; msgnum < msgs.size; msgnum++) - if (!m_convert (mp, msgs.msgs[msgnum])) + if (!m_convert(mp, msgs.msgs[msgnum])) done(1); - seq_setprev (mp); /* set the Previous-Sequence */ + seq_setprev(mp); /* set the Previous-Sequence */ - context_replace (pfolder, folder); /* update current folder */ - seq_save (mp); /* synchronize message sequences */ - context_save (); /* save the context file */ + context_replace(pfolder, folder); /* update current folder */ + seq_save(mp); /* synchronize message sequences */ + context_save(); /* save the context file */ /* ** Get the sequence number for each sequence ** specified by Unseen-Sequence */ - if ((cp = context_find (usequence)) && *cp) { + if ((cp = context_find(usequence)) && *cp) { char **ap, *dp; dp = getcpy(cp); - ap = brkstring (dp, " ", "\n"); + ap = brkstring(dp, " ", "\n"); for (i = 0; ap && *ap; i++, ap++) - seqnum[i] = seq_getnum (mp, *ap); + seqnum[i] = seq_getnum(mp, *ap); num_unseen_seq = i; if (dp) free(dp); } - ontty = isatty (fileno (stdout)); + ontty = isatty(fileno(stdout)); #ifdef LBL else @@ -259,14 +259,14 @@ main (int argc, char **argv) (revflag ? msgnum >= mp->lowsel : msgnum <= mp->hghsel); msgnum += (revflag ? -1 : 1)) { if (is_selected(mp, msgnum)) { - if ((in = fopen (cp = m_name (msgnum), "r")) == NULL) { + if ((in = fopen(cp = m_name(msgnum), "r")) == NULL) { #if 0 if (errno != EACCES) #endif - admonish (cp, "unable to open message"); + admonish(cp, "unable to open message"); #if 0 else - printf ("%*d unreadable\n", + printf("%*d unreadable\n", DMAXFOLDER, msgnum); #endif continue; @@ -274,8 +274,7 @@ main (int argc, char **argv) #ifndef JLR if (hdrflag) { - printf ("FOLDER %s\t%s\n", folder, - dtimenow(1)); + printf("FOLDER %s\t%s\n", folder, dtimenow(1)); } #endif /* JLR */ @@ -291,7 +290,7 @@ main (int argc, char **argv) } } - switch (state = scan (in, msgnum, 0, nfs, width, + switch (state = scan(in, msgnum, 0, nfs, width, msgnum == mp->curmsg, unseen, folder, 0L, 1)) { case SCNMSG: @@ -300,34 +299,33 @@ main (int argc, char **argv) break; default: - adios (NULL, "scan() botch (%d)", - state); + adios(NULL, "scan() botch(%d)", state); case SCNEOF: #if 0 - printf ("%*d empty\n", DMAXFOLDER, + printf("%*d empty\n", DMAXFOLDER, msgnum); #else - advise (NULL, "message %d: empty", + advise(NULL, "message %d: empty", msgnum); #endif break; } hdrflag = 0; - fclose (in); + fclose(in); if (ontty) - fflush (stdout); + fflush(stdout); } } #ifdef LBL - seq_save (mp); /* because formatsbr might have made changes */ + seq_save(mp); /* because formatsbr might have made changes */ #endif - folder_free (mp); /* free folder/message structure */ + folder_free(mp); /* free folder/message structure */ if (clearflag) - clear_screen (); + clear_screen(); - done (0); + done(0); return 1; }