snow/dockapps
1
0
Fork 0
Code Issues Releases Activity

wmail: consistent 4-column indentation with 8-character tabs.

Browse source
This commit is contained in:
Jeremy Sowden 2019-05-27 22:52:05 +01:00 committed by Carlos R. Mafra
parent 293e8aab96
commit adf1164fba
3 changed files with 864 additions and 864 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

318
wmail/src/config.c
View file

@ -101,9 +101,9 @@ config_t config = {
NULL, NULL,
NULL, NULL,
false, false,
NULL, NULL,
0, 0,
0 0
}; };
// enumeration names for ticker mode // enumeration names for ticker mode
@ -121,23 +121,23 @@ bool Tokenize( const char *line, const char **id, const char **value )
const char *token1, *token2; const char *token1, *token2;
if( line != NULL ) if( line != NULL )
{
token1 = SkipWhiteSpaces( line );
if(( len = strlen( token1 )) != 0 && token1[0] != '#' )
{ {
token1 = SkipWhiteSpaces( line ); token2 = strchr( token1, '=' );
if( token2 != NULL )
token2 = SkipWhiteSpaces( token2+1 );
if(( len = strlen( token1 )) != 0 && token1[0] != '#' ) if( !IsWhiteSpace( token2 ))
{ {
token2 = strchr( token1, '=' ); *id = token1;
if( token2 != NULL ) *value = token2;
token2 = SkipWhiteSpaces( token2+1 );
if( !IsWhiteSpace( token2 )) return true;
{ }
*id = token1; }
*value = token2;
return true;
}
}
} }
return false; return false;
@ -149,19 +149,19 @@ void AddSenderToSkipList( char *sender )
char **skipName, **newList; char **skipName, **newList;
for( skipName = config.skipNames, numNames = 0; for( skipName = config.skipNames, numNames = 0;
skipName != NULL && *skipName != NULL; skipName++ ) skipName != NULL && *skipName != NULL; skipName++ )
{ {
if( !strcmp( *skipName, sender )) if( !strcmp( *skipName, sender ))
return; return;
numNames++; numNames++;
} }
TRACE( "adding \"%s\" to skip-list of currently %d names\n", sender, numNames ); TRACE( "adding \"%s\" to skip-list of currently %d names\n", sender, numNames );
newList = malloc( sizeof(char *) * (numNames + 2) ); newList = malloc( sizeof(char *) * (numNames + 2) );
for( i = 0; i < numNames; ++i ) for( i = 0; i < numNames; ++i )
newList[i] = config.skipNames[i]; newList[i] = config.skipNames[i];
newList[i] = strdup( sender ); newList[i] = strdup( sender );
newList[i+1] = NULL; newList[i+1] = NULL;
@ -171,177 +171,177 @@ void AddSenderToSkipList( char *sender )
void ResetConfigStrings() void ResetConfigStrings()
{ {
if( !( config.givenOptions & CL_MAILBOX )) { if( !( config.givenOptions & CL_MAILBOX )) {
free( config.mailBox ); free( config.mailBox );
config.mailBox = NULL; config.mailBox = NULL;
} }
if( !( config.givenOptions & CL_RUNCMD )) { if( !( config.givenOptions & CL_RUNCMD )) {
free( config.runCmd ); free( config.runCmd );
config.runCmd = NULL; config.runCmd = NULL;
} }
if( !( config.givenOptions & CL_SYMBOLCOLOR )) { if( !( config.givenOptions & CL_SYMBOLCOLOR )) {
free( config.symbolColor ); free( config.symbolColor );
config.symbolColor = NULL; config.symbolColor = NULL;
} }
if( !( config.givenOptions & CL_FONTCOLOR )) { if( !( config.givenOptions & CL_FONTCOLOR )) {
free( config.fontColor ); free( config.fontColor );
config.fontColor = NULL; config.fontColor = NULL;
} }
if( !( config.givenOptions & CL_BACKCOLOR )) { if( !( config.givenOptions & CL_BACKCOLOR )) {
free( config.backColor ); free( config.backColor );
config.backColor = NULL; config.backColor = NULL;
} }
if( !( config.givenOptions & CL_OFFLIGHTCOLOR )) { if( !( config.givenOptions & CL_OFFLIGHTCOLOR )) {
free( config.offlightColor ); free( config.offlightColor );
config.offlightColor = NULL; config.offlightColor = NULL;
} }
if( !( config.givenOptions & CL_BACKGROUNDCOLOR )) { if( !( config.givenOptions & CL_BACKGROUNDCOLOR )) {
free( config.backgroundColor ); free( config.backgroundColor );
config.backgroundColor = NULL; config.backgroundColor = NULL;
} }
if( !( config.givenOptions & CL_CHECKSUMFILENAME )) { if( !( config.givenOptions & CL_CHECKSUMFILENAME )) {
free( config.checksumFileName ); free( config.checksumFileName );
config.checksumFileName = NULL; config.checksumFileName = NULL;
} }
if( !( config.givenOptions & CL_CMDONMAIL )) { if( !( config.givenOptions & CL_CMDONMAIL )) {
free( config.cmdOnMail ); free( config.cmdOnMail );
config.cmdOnMail = NULL; config.cmdOnMail = NULL;
} }
if( !( config.givenOptions & CL_USEX11FONT )) { if( !( config.givenOptions & CL_USEX11FONT )) {
free( config.useX11Font ); free( config.useX11Font );
config.useX11Font = NULL; config.useX11Font = NULL;
} }
} }
void PostProcessConfiguration() void PostProcessConfiguration()
{ {
if( config.display == NULL ) if( config.display == NULL )
config.display = strdup( WMAIL_DISPLAY ); config.display = strdup( WMAIL_DISPLAY );
if( config.runCmd == NULL ) if( config.runCmd == NULL )
config.runCmd = strdup( WMAIL_CLIENT_CMD ); config.runCmd = strdup( WMAIL_CLIENT_CMD );
if( config.mailBox == NULL ) if( config.mailBox == NULL )
{ {
char *envMBox = getenv( "MAIL" ); char *envMBox = getenv( "MAIL" );
if( envMBox != NULL ) if( envMBox != NULL )
config.mailBox = strdup( envMBox ); config.mailBox = strdup( envMBox );
} }
} }
void ReadConfigFile( bool resetConfigStrings ) void ReadConfigFile( bool resetConfigStrings )
{ {
char *usersHome; char *usersHome;
// free all config strings and reset their pointers if required // free all config strings and reset their pointers if required
if( resetConfigStrings ) if( resetConfigStrings )
ResetConfigStrings(); ResetConfigStrings();
if(( usersHome = getenv( "HOME" )) != NULL ) if(( usersHome = getenv( "HOME" )) != NULL )
{
char *fileName = MakePathName( usersHome, WMAIL_RC_FILE );
FILE *f = fopen( fileName, "rt" );
if( f != NULL )
{ {
char *fileName = MakePathName( usersHome, WMAIL_RC_FILE ); char buf[1024];
FILE *f = fopen( fileName, "rt" ); int line = 1;
if( f != NULL ) for( ; !feof( f ); ++line )
{ {
char buf[1024]; const char *id, *value;
int line = 1; unsigned int len;
for( ; !feof( f ); ++line ) if( fgets( buf, 1024, f ) == NULL )
{ break;
const char *id, *value;
unsigned int len;
if( fgets( buf, 1024, f ) == NULL ) // first eliminate the trailing whitespaces
break; for( len = strlen( buf );
len > 0 && IsWhiteSpace(buf+(--len)); )
*(buf+len) = '\0';
// first eliminate the trailing whitespaces if( !Tokenize( buf, &id, &value ))
for( len = strlen( buf ); continue;
len > 0 && IsWhiteSpace(buf+(--len)); )
*(buf+len) = '\0';
if( !Tokenize( buf, &id, &value )) if( !strncasecmp( id, "Window.Display", 14 )) {
continue; if( !( config.givenOptions & CL_DISPLAY ))
ReadString( value, line, &config.display );
} else if( !strncasecmp( id, "Window.NonShaped", 16 )) {
if( !( config.givenOptions & CL_NOSHAPE ))
ReadBool( value, line, &config.noshape );
} else if( !strncasecmp( id, "Window.Button.Command", 21 )) {
if( !( config.givenOptions & CL_RUNCMD ))
ReadString( value, line, &config.runCmd );
} else if( !strncasecmp( id, "Mail.MailBox", 12 )) {
if( !( config.givenOptions & CL_MAILBOX ))
ReadString( value, line, &config.mailBox );
} else if( !strncasecmp( id, "Mail.ChecksumFile", 17 )) // no corresponding cmdline option
ReadString( value, line, &config.checksumFileName );
else if( !strncasecmp( id, "Mail.CheckIntervall", 19 )) {
if( !( config.givenOptions & CL_CHECKINTERVAL ))
ReadInt( value, line, &config.checkInterval );
} else if( !strncasecmp( id, "Mail.ShowOnlyNew", 16 )) {
if( !( config.givenOptions & CL_NEWMAILONLY ))
ReadBool( value, line, &config.newMailsOnly );
} else if( !strncasecmp( id, "Ticker.Mode", 11 )) {
if( !( config.givenOptions & CL_TICKERMODE ))
ReadEnum( value, line, (int *)&config.tickerMode, tickerEnum );
} else if( !strncasecmp( id, "Ticker.Frames", 13 )) {
if( !( config.givenOptions & CL_FPS ))
ReadInt( value, line, &config.fps );
} else if( !strncasecmp( id, "Colors.Symbols", 14 )) {
if( !( config.givenOptions & CL_SYMBOLCOLOR ))
ReadString( value, line, &config.symbolColor );
} else if( !strncasecmp( id, "Colors.Font", 11 )) {
if( !( config.givenOptions & CL_FONTCOLOR ))
ReadString( value, line, &config.fontColor );
} else if( !strncasecmp( id, "Colors.Backlight", 16 )) {
if( !( config.givenOptions & CL_BACKCOLOR ))
ReadString( value, line, &config.backColor );
} else if( !strncasecmp( id, "Colors.OffLight", 15 )) {
if( !( config.givenOptions & CL_OFFLIGHTCOLOR ))
ReadString( value, line, &config.offlightColor );
} else if( !strncasecmp( id, "Colors.NonShapedFrame", 21 )) {
if( !( config.givenOptions & CL_NOSHAPE ))
ReadString( value, line, &config.backgroundColor );
} else if( !strncasecmp( id, "Ticker.X11Font", 14 )) {
if( !( config.givenOptions & CL_USEX11FONT ))
ReadString( value, line, &config.useX11Font );
} else if( !strncasecmp( id, "Mail.SkipSender", 15 )) { // no corresponding cmdline options
char *skip;
if( ReadString( value, line, &skip ))
AddSenderToSkipList( skip );
} else if( !strncasecmp( id, "Mail.OnNew.Command", 18 )) {
if( !( config.givenOptions & CL_CMDONMAIL ))
ReadString( value, line, &config.cmdOnMail );
} else if( !strncasecmp( id, "Mail.UseStatusField", 19 )) {
if( !( config.givenOptions & CL_CONSIDERSTATUSFIELD ))
ReadBool( value, line, &config.considerStatusField );
} else if( !strncasecmp( id, "Mail.ReadStatus", 15 )) {
if( !( config.givenOptions & CL_READSTATUS ))
ReadString( value, line, &config.readStatus );
} else
WARNING( "cfg-file(%i): unrecognized: \"%s\"\n", line, buf );
}
if( !strncasecmp( id, "Window.Display", 14 )) { fclose( f );
if( !( config.givenOptions & CL_DISPLAY )) } else {
ReadString( value, line, &config.display ); TRACE( "unable to open config-file \"%s\"\n", fileName );
} else if( !strncasecmp( id, "Window.NonShaped", 16 )) { }
if( !( config.givenOptions & CL_NOSHAPE ))
ReadBool( value, line, &config.noshape );
} else if( !strncasecmp( id, "Window.Button.Command", 21 )) {
if( !( config.givenOptions & CL_RUNCMD ))
ReadString( value, line, &config.runCmd );
} else if( !strncasecmp( id, "Mail.MailBox", 12 )) {
if( !( config.givenOptions & CL_MAILBOX ))
ReadString( value, line, &config.mailBox );
} else if( !strncasecmp( id, "Mail.ChecksumFile", 17 )) // no corresponding cmdline option
ReadString( value, line, &config.checksumFileName );
else if( !strncasecmp( id, "Mail.CheckIntervall", 19 )) {
if( !( config.givenOptions & CL_CHECKINTERVAL ))
ReadInt( value, line, &config.checkInterval );
} else if( !strncasecmp( id, "Mail.ShowOnlyNew", 16 )) {
if( !( config.givenOptions & CL_NEWMAILONLY ))
ReadBool( value, line, &config.newMailsOnly );
} else if( !strncasecmp( id, "Ticker.Mode", 11 )) {
if( !( config.givenOptions & CL_TICKERMODE ))
ReadEnum( value, line, (int *)&config.tickerMode, tickerEnum );
} else if( !strncasecmp( id, "Ticker.Frames", 13 )) {
if( !( config.givenOptions & CL_FPS ))
ReadInt( value, line, &config.fps );
} else if( !strncasecmp( id, "Colors.Symbols", 14 )) {
if( !( config.givenOptions & CL_SYMBOLCOLOR ))
ReadString( value, line, &config.symbolColor );
} else if( !strncasecmp( id, "Colors.Font", 11 )) {
if( !( config.givenOptions & CL_FONTCOLOR ))
ReadString( value, line, &config.fontColor );
} else if( !strncasecmp( id, "Colors.Backlight", 16 )) {
if( !( config.givenOptions & CL_BACKCOLOR ))
ReadString( value, line, &config.backColor );
} else if( !strncasecmp( id, "Colors.OffLight", 15 )) {
if( !( config.givenOptions & CL_OFFLIGHTCOLOR ))
ReadString( value, line, &config.offlightColor );
} else if( !strncasecmp( id, "Colors.NonShapedFrame", 21 )) {
if( !( config.givenOptions & CL_NOSHAPE ))
ReadString( value, line, &config.backgroundColor );
} else if( !strncasecmp( id, "Ticker.X11Font", 14 )) {
if( !( config.givenOptions & CL_USEX11FONT ))
ReadString( value, line, &config.useX11Font );
} else if( !strncasecmp( id, "Mail.SkipSender", 15 )) { // no corresponding cmdline options
char *skip;
if( ReadString( value, line, &skip ))
AddSenderToSkipList( skip );
} else if( !strncasecmp( id, "Mail.OnNew.Command", 18 )) {
if( !( config.givenOptions & CL_CMDONMAIL ))
ReadString( value, line, &config.cmdOnMail );
} else if( !strncasecmp( id, "Mail.UseStatusField", 19 )) {
if( !( config.givenOptions & CL_CONSIDERSTATUSFIELD ))
ReadBool( value, line, &config.considerStatusField );
} else if( !strncasecmp( id, "Mail.ReadStatus", 15 )) {
if( !( config.givenOptions & CL_READSTATUS ))
ReadString( value, line, &config.readStatus );
} else
WARNING( "cfg-file(%i): unrecognized: \"%s\"\n", line, buf );
}
fclose( f );
} else {
TRACE( "unable to open config-file \"%s\"\n", fileName );
}
} else { } else {
TRACE( "no $HOME defined - config-file not read\n" ); TRACE( "no $HOME defined - config-file not read\n" );
} }
PostProcessConfiguration(); PostProcessConfiguration();
} }
bool ReadString( const char *from, unsigned int line, char **to ) bool ReadString( const char *from, unsigned int line, char **to )
@ -449,7 +449,7 @@ bool ReadInt( const char *from, unsigned int line, int *to )
} }
} }
} else for( ; *from != '\0' && !IsWhiteSpace( from ); ++from ) { } else for( ; *from != '\0' && !IsWhiteSpace( from ); ++from ) {
if( value > (INT_MAX - 9) / 10 ) { if( value > (INT_MAX - 9) / 10 ) {
WARNING( "cfg-file(%i): decimal-number too large: \">%i\"\n", line, INT_MAX ); WARNING( "cfg-file(%i): decimal-number too large: \">%i\"\n", line, INT_MAX );
return false; return false;
} }

44
wmail/src/config.h
View file

@ -48,25 +48,25 @@ enum {
// flags to mark used cmdline options // flags to mark used cmdline options
enum { enum {
CL_DISPLAY = 1<<0, CL_DISPLAY = 1<<0,
CL_MAILBOX = 1<<1, CL_MAILBOX = 1<<1,
CL_RUNCMD = 1<<2, CL_RUNCMD = 1<<2,
CL_SYMBOLCOLOR = 1<<3, CL_SYMBOLCOLOR = 1<<3,
CL_FONTCOLOR = 1<<4, CL_FONTCOLOR = 1<<4,
CL_BACKCOLOR = 1<<5, CL_BACKCOLOR = 1<<5,
CL_OFFLIGHTCOLOR = 1<<6, CL_OFFLIGHTCOLOR = 1<<6,
CL_BACKGROUNDCOLOR = 1<<7, CL_BACKGROUNDCOLOR = 1<<7,
CL_CHECKSUMFILENAME = 1<<8, CL_CHECKSUMFILENAME = 1<<8,
CL_CHECKINTERVAL = 1<<9, CL_CHECKINTERVAL = 1<<9,
CL_FPS = 1<<10, CL_FPS = 1<<10,
CL_NEWMAILONLY = 1<<11, CL_NEWMAILONLY = 1<<11,
CL_NOSHAPE = 1<<12, CL_NOSHAPE = 1<<12,
CL_TICKERMODE = 1<<13, CL_TICKERMODE = 1<<13,
CL_SKIPNAMES = 1<<14, CL_SKIPNAMES = 1<<14,
CL_CMDONMAIL = 1<<15, CL_CMDONMAIL = 1<<15,
CL_CONSIDERSTATUSFIELD = 1<<16, CL_CONSIDERSTATUSFIELD = 1<<16,
CL_READSTATUS = 1<<17, CL_READSTATUS = 1<<17,
CL_USEX11FONT = 1<<18 CL_USEX11FONT = 1<<18
}; };
typedef struct _config_t { typedef struct _config_t {
@ -87,11 +87,11 @@ typedef struct _config_t {
char **skipNames; // sender-names that wmail has to skip char **skipNames; // sender-names that wmail has to skip
char *cmdOnMail; // command to execute when a new mail has received char *cmdOnMail; // command to execute when a new mail has received
bool considerStatusField; // use the status-field of the mail-header to determine its read-status bool considerStatusField; // use the status-field of the mail-header to determine its read-status
char *readStatus; // status field content that indicates read mails ("O" for netscape, "ro" for pine etc.) char *readStatus; // status field content that indicates read mails ("O" for netscape, "ro" for pine etc.)
char *useX11Font; // X11 font to render the ticker (NULL -> fallback to buildin font) char *useX11Font; // X11 font to render the ticker (NULL -> fallback to buildin font)
// ---------------------- // // ---------------------- //
int colorsUsed; // used (malloced) color-names int colorsUsed; // used (malloced) color-names
int givenOptions; // bitfield flags all options specified on the cmd-line int givenOptions; // bitfield flags all options specified on the cmd-line
} config_t; } config_t;

1366
wmail/src/wmail.c
View file

File diff suppressed because it is too large Load diff