diff options
Diffstat (limited to '')
| -rw-r--r-- | file.c | 27 | ||||
| -rw-r--r-- | mailcap.c | 4 | ||||
| -rw-r--r-- | main.c | 4 | 
3 files changed, 18 insertions, 17 deletions
| @@ -1,4 +1,4 @@ -/* $Id: file.c,v 1.20 2001/11/30 09:54:22 ukai Exp $ */ +/* $Id: file.c,v 1.21 2001/11/30 10:00:06 ukai Exp $ */  #include "fm.h"  #include <sys/types.h>  #include "myctype.h" @@ -143,6 +143,7 @@ char *violations[COO_EMAX] = {  };  #endif +/* *INDENT-OFF* */  static struct compression_decoder {      int type;      char *ext; @@ -152,16 +153,17 @@ static struct compression_decoder {      char *name;      char *encoding;  } compression_decoders[] = { -    {CMP_COMPRESS, ".gz", "application/x-gzip", -     0, GUNZIP_CMDNAME, GUNZIP_NAME, "gzip"}, -    {CMP_COMPRESS, ".Z", "application/x-compress", -     0, GUNZIP_CMDNAME, GUNZIP_NAME, "compress"}, -    {CMP_BZIP2, ".bz2", "application/x-bzip", -     0, BUNZIP2_CMDNAME, BUNZIP2_NAME, "bzip, bzip2"}, -    {CMP_DEFLATE, NULL, "application/x-deflate", -     1, INFLATE_CMDNAME, INFLATE_NAME, "deflate"}, -    {CMP_NOCOMPRESS, NULL, NULL, 0, NULL, NULL, NULL}, +    { CMP_COMPRESS, ".gz", "application/x-gzip", +      0, GUNZIP_CMDNAME, GUNZIP_NAME, "gzip"},  +    { CMP_COMPRESS, ".Z", "application/x-compress", +      0, GUNZIP_CMDNAME, GUNZIP_NAME, "compress"},  +    { CMP_BZIP2, ".bz2", "application/x-bzip", +      0, BUNZIP2_CMDNAME, BUNZIP2_NAME, "bzip, bzip2"},  +    { CMP_DEFLATE, NULL, "application/x-deflate", +      1, INFLATE_CMDNAME, INFLATE_NAME, "deflate"},  +    { CMP_NOCOMPRESS, NULL, NULL, 0, NULL, NULL, NULL},  }; +/* *INDENT-ON* */  #define SAVE_BUF_SIZE 1536 @@ -267,7 +269,7 @@ static char *  compress_application_type(int compression)  {      struct compression_decoder *d; -     +      for (d = compression_decoders; d->type != CMP_NOCOMPRESS; d++) {  	if (d->type == compression)  	    return d->mime_type; @@ -371,8 +373,7 @@ check_command(char *cmd, int libfile_p)  	Strcat_charp(pathname, p);  	Strcat_char(pathname, '/');  	Strcat_charp(pathname, cmd); -	if (stat(pathname->ptr, &st) == 0  -	    && S_ISREG(st.st_mode)  +	if (stat(pathname->ptr, &st) == 0 && S_ISREG(st.st_mode)  	    && (st.st_mode & S_IXANY) != 0)  	    return 1;      } @@ -1,4 +1,4 @@ -/* $Id: mailcap.c,v 1.8 2001/11/30 09:54:22 ukai Exp $ */ +/* $Id: mailcap.c,v 1.9 2001/11/30 10:00:06 ukai Exp $ */  #include "fm.h"  #include "myctype.h"  #include <stdio.h> @@ -251,7 +251,7 @@ acceptableMimeTypes()      /* generate acceptable media types */      l = newTextList(); -    mhash = newHash_si(16); /* XXX */ +    mhash = newHash_si(16);	/* XXX */      pushText(l, "text");      putHash_si(mhash, "text", 1);      pushText(l, "image"); @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.27 2001/11/30 04:56:00 ukai Exp $ */ +/* $Id: main.c,v 1.28 2001/11/30 10:00:06 ukai Exp $ */  #define MAINPROGRAM  #include "fm.h"  #include <signal.h> @@ -3763,7 +3763,7 @@ _peekURL(int only_img)      }      a = (only_img ? NULL : retrieveCurrentAnchor(Currentbuf));      if (a == NULL) { -	a = (only_img ? NULL :retrieveCurrentForm(Currentbuf)); +	a = (only_img ? NULL : retrieveCurrentForm(Currentbuf));  	if (a == NULL) {  	    a = retrieveCurrentImg(Currentbuf);  	    if (a == NULL) { | 
