list_switch(CT ct, int toplevel, int realsize, int verbose, int debug)
{
switch (ct->c_type) {
- case CT_MULTIPART:
- return list_multi(ct, toplevel, realsize, verbose,
- debug);
+ case CT_MULTIPART:
+ return list_multi(ct, toplevel, realsize, verbose, debug);
+ break;
+
+ case CT_MESSAGE:
+ switch (ct->c_subtype) {
+ case MESSAGE_PARTIAL:
+ return list_partial(ct, toplevel, realsize, verbose,
+ debug);
break;
- case CT_MESSAGE:
- switch (ct->c_subtype) {
- case MESSAGE_PARTIAL:
- return list_partial(ct, toplevel,
- realsize, verbose,
- debug);
- break;
-
- case MESSAGE_EXTERNAL:
- return list_external(ct, toplevel,
- realsize, verbose,
- debug);
- break;
-
- case MESSAGE_RFC822:
- default:
- return list_content(ct, toplevel,
- realsize, verbose,
- debug);
- break;
- }
- break;
-
- case CT_TEXT:
- case CT_AUDIO:
- case CT_IMAGE:
- case CT_VIDEO:
- return list_content(ct, toplevel, realsize, verbose,
- debug);
- break;
-
- case CT_APPLICATION:
- return list_application(ct, toplevel, realsize,
- verbose, debug);
+ case MESSAGE_EXTERNAL:
+ return list_external(ct, toplevel, realsize, verbose,
+ debug);
break;
+ case MESSAGE_RFC822:
default:
- /* list_debug (ct); */
- adios(NULL, "unknown content type %d", ct->c_type);
+ return list_content(ct, toplevel, realsize, verbose,
+ debug);
break;
+ }
+ break;
+
+ case CT_TEXT:
+ case CT_AUDIO:
+ case CT_IMAGE:
+ case CT_VIDEO:
+ return list_content(ct, toplevel, realsize, verbose, debug);
+ break;
+
+ case CT_APPLICATION:
+ return list_application(ct, toplevel, realsize, verbose,
+ debug);
+ break;
+
+ default:
+ /* list_debug (ct); */
+ adios(NULL, "unknown content type %d", ct->c_type);
+ break;
}
return 0; /* NOT REACHED */
CI ci = &ct->c_ctinfo;
printf(toplevel > 0 ? LSTFMT2a : toplevel < 0 ? "part " : " ",
- atoi(r1bindex(empty(ct->c_file), '/')));
+ atoi(mhbasename(empty(ct->c_file))));
snprintf(buffer, sizeof(buffer), "%s/%s", empty(ci->ci_type),
empty(ci->ci_subtype));
printf(LSTFMT2b, empty(ct->c_partno), buffer);
/* print size of this body part */
switch (*cp) {
- case ' ':
- if (size > 0 || ct->c_encoding != CE_EXTERNAL)
- printf(LSTFMT2c1, size);
- else
- printf(LSTFMT2c4);
- break;
-
- default:
- printf(LSTFMT2c2, size, *cp);
- break;
-
- case '\0':
- printf(LSTFMT2c3);
+ case ' ':
+ if (size > 0 || ct->c_encoding != CE_EXTERNAL)
+ printf(LSTFMT2c1, size);
+ else
+ printf(LSTFMT2c4);
+ break;
+
+ default:
+ printf(LSTFMT2c2, size, *cp);
+ break;
+
+ case '\0':
+ printf(LSTFMT2c3);
}
/* print Content-Description */
if (ct->c_descr) {
char *dp;
- dp = trimcpy(cp = add(ct->c_descr, NULL));
+ dp = trimcpy(cp = getcpy(ct->c_descr));
free(cp);
printf(LSTFMT2d1, dp);
free(dp);
if (verbose && ci->ci_comment) {
char *dp;
- dp = trimcpy(cp = add(ci->ci_comment, NULL));
+ dp = trimcpy(cp = getcpy(ci->ci_comment));
free(cp);
snprintf(buffer, sizeof(buffer), "(%s)", dp);
free(dp);