noffle: src/post.c comparison

comparison src/post.c @ 150:1c7303c71f66 noffle

[svn] * src/protocol.c: Fix bug in Prt_getLn if we should read a line starting with '\0' - according to the leafnode mailing list, this has been seen in the wild. * docs/inews.1,docs/noffle.1,docs/noffle.conf.5, packages/redhat/noffle.spec,src/configfile.h,src/configfile.c, src/noffle.c,src/post.h,src/post.c: Removed use of getopt_long, and added inews mode - the Noffle executable behaves as inews is invoked as inews. This includes adding From: and Organization: headers if necessary - add configs to override defaults for the From: domain and specify the organization. For all my fellow trn-heads out there, and users of any other ageing newsreader that expects inews. Updated RPM spec to create inews link to noffle on install.

author	bears
date	Thu, 26 Oct 2000 22:21:13 +0100
parents	55ba957023f9
children	ca9769519c96

comparison

equal deleted inserted replaced

-:bfeea2bc09b6
+:1c7303c71f66
 /*
 post.c
-$Id: post.c 202 2000-08-23 09:52:25Z enz $
+$Id: post.c 227 2000-10-26 21:21:13Z bears $
 */
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
+#include <errno.h>
+#include <pwd.h>
 #include <stdio.h>
+#include <sys/types.h>
+#include <unistd.h>
 #include "post.h"
 #include <string.h>
 #include "common.h"
 #include "configfile.h"
 #include "content.h"
 #include "over.h"
 #include "protocol.h"
 #include "util.h"
 #include "portable.h"
+#define	BEGIN_SIG	"-- "
+#define	SIG_FILE	"/.signature"
 struct OverInfo
 {
 Str subject;
 Str from;
 Str date;
 DynStr *text;	   /* Processed article text */
 ItemList *newsgroups;  /* Newsgroups for dispatch */
 ItemList *control;	   /* Control message? NULL if not */
 Bool approved;	   /* Has Approved: header? */
 Bool posted;	   /* Has it been put in the article database? */
+int flags;             /* Posting flags */
 struct OverInfo over;
 };
-static struct Article article = { NULL, NULL, NULL, FALSE, FALSE,
+static struct Article article = { NULL, NULL, NULL, FALSE, FALSE, 0,
 				  { "", "", "", "", "", 0, 0 } };
 /* Add the article to a group. */
 static Bool
 addToGroup( const char * grp )
 static Bool
 getArticleText( const char *p )
 {
 DynStr * s;
 Str line, field, value;
-Bool replyToFound, pathFound;
+Bool replyToFound, pathFound, orgFound;
 time_t t;
+int sigLines;
 s = new_DynStr( 10000 );
 article.text = s;
 memset( &article.over, 0, sizeof( article.over ) );
-replyToFound = pathFound = FALSE;
+replyToFound = pathFound = orgFound = FALSE;
 /* Grab header lines first, getting overview info as we go. */
 while ( ( p = Utl_getHeaderLn( line, p ) ) != NULL
 	    && line[ 0 ] != '\0'
 	    && Prt_getField( field, value, line ) )
 	else if ( strcmp ( field, "path" ) == 0 )
 	{
 	    pathFound = TRUE;
 	    DynStr_appLn( s, line );
 	}
+	else if ( strcmp ( field, "organization" ) == 0 )
+	{
+	    orgFound = TRUE;
+	    DynStr_appLn( s, line );
+	}
 	else if ( strcmp ( field, "x-sender" ) == 0 )
 	{
 	    DynStr_app( s, "X-NOFFLE-X-Sender: " );
 	    DynStr_appLn( s, value );
 	}
 }
 /* Now sort header-related issues */
 if ( article.over.from[ 0 ] == '\0' )
 {
-	Log_err( "Posted message has no From field" );
+	if ( article.flags & POST_ADD_FROM )
-	return FALSE;
+	{
+	    Log_dbg( "Adding From field to posted message." );
+	    DynStr_app( s, "From: " );
+	    if ( ! Prt_genFromHdr( article.over.from ) )
+	    {
+		Log_err( "Can't generate From field" );
+		return FALSE;
+	    }
+	    DynStr_appLn( s, article.over.from );
+	}
+	else
+	{
+	    Log_err( "Posted message has no From field" );
+	    return FALSE;
+	}
 }
 if ( article.over.subject[ 0 ] == '\0' )
 {
 	Log_err( "Posted message has no Subject field" );
 	return FALSE;
 	Log_dbg( "Adding Reply-To field to posted message." );
 	DynStr_app( s, "Reply-To: " );
 	DynStr_appLn( s, article.over.from );
 }
+/* Ensure Organization header if required */
+if ( ( ! orgFound ) && ( article.flags & POST_ADD_ORG ) )
+{
+	Str org;
+	Utl_cpyStr( org, Cfg_organization() );
+	if ( org[ 0 ] != '\0' )
+	{
+	    Log_dbg( "Adding Organization field to posted message." );
+	    DynStr_app( s, "Organization: " );
+	    DynStr_appLn( s, org );
+	}
+}
 /* OK, header ready to roll. Something to accompany it? */
 if ( p == NULL || p[ 0 ] == '\0' )
 {
 	Log_err( "Posted  message has no body" );
 	return FALSE;
 }
 /* Add the empty line separating header and body */
 DynStr_appLn( s, "" );
-/* Now pop on the rest of the body and count the lines & bytes */
+/* Now pop on the rest of the body */
 DynStr_app( s, p );
-for ( p++, article.over.lines = 0; *p != '\0'; p++ )
+/* Add a signature if requested to do so and if one found. */
+sigLines = 0;
+if ( article.flags & POST_ADD_SIG )
+{
+	Str sigfile;
+	struct passwd *pwd;
+	FILE *f;
+	/* Generate sig file path */
+	pwd = getpwuid( getuid() );
+	Utl_cpyStr( sigfile, pwd->pw_dir );
+	Utl_catStr( sigfile, SIG_FILE );
+	f = fopen( sigfile, "r" );
+	if ( f == NULL )
+	{
+	    /* If err is ENOENT, file doesn't exist. This is OK. */
+	    if ( errno != ENOENT )
+	    {
+		Log_err( "Can't access .signature file (%s), "
+			 "article not posted.",
+			 strerror( errno ) );
+		return FALSE;
+	    }
+	}
+	else
+	{
+	    /* OK, try to add it. */
+	    Str sline;
+	    Log_dbg( "Adding .signature to posted message." );
+	    DynStr_appLn( s, BEGIN_SIG );
+	    sigLines++;
+	    while ( Prt_getLn( sline, f, 0 ) )
+	    {
+		DynStr_appLn( s, sline );
+		sigLines++;
+	    }
+	    if ( ferror( f ) )
+	    {
+		Log_err( "Error reading .signature file (%s), "
+			 "article not posted.",
+			 strerror( errno ) );
+		fclose( f );
+		return FALSE;
+	    }
+	    fclose( f );
+	}
+}
+/*
+* Count the lines & bytes. This counts the original number of
+* lines in the supplied body, so add in the number of signature
+* lines added, including the separator.
+*/
+for ( p++, article.over.lines = sigLines; *p != '\0'; p++ )
 	if ( *p == '\n' )
 	    article.over.lines++;
 article.over.bytes = DynStr_len( s );
 return TRUE;
 return postExternal() && err;
 }
 /* Register an article for posting. */
 Bool
-Post_open( const char * text )
+Post_open( const char * text, unsigned flags )
 {
 if ( article.text != NULL )
 {
 	Log_err( "Busy article in Post_open." );
 	return FALSE;
 }
+article.flags = flags;
 if ( ! getArticleText( text ) )
 	return FALSE;
 if ( Db_contains( article.over.msgId ) )
 {
 /* Process the posting */
 Bool
 Post_post( void )
 {
+if ( article.flags & POST_DEBUG )
+{
+	fputs( DynStr_str( article.text ), stdout );
+	return TRUE;
+}
 if ( ! checkPostableNewsgroup() )
 	return FALSE;
 return ( article.control == NULL )
 	? ! postArticle()

Mercurial > noffle

comparison src/post.c @ 150:1c7303c71f66 noffle