Mercurial > hg > mlmmj

changeset 3:bea555bef489

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mainly cleanups. More to follow.
author mmj
date Thu, 22 Apr 2004 06:20:34 +1000
parents 43db5460139a
children 7bfadc600c99
files src/Makefile.am src/Makefile.in src/mlmmj-recieve.c src/readln.c
diffstat 4 files changed, 23 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/src/Makefile.am	Thu Apr 22 06:18:22 2004 +1000
+++ b/src/Makefile.am	Thu Apr 22 06:20:34 2004 +1000
@@ -29,8 +29,8 @@
 
 mlmmj_subscribe_SOURCES = mlmmj-subscribe.c writen.c mylocking.c \
 			getlistaddr.c chomp.c random-int.c strgen.c \
-			subscriberfuncs.c getline.c print-version.c
+			subscriberfuncs.c readln.c print-version.c
 
-mlmmj_unsubscribe_SOURCES = mlmmj-unsubscribe.c writen.c getline.c mylocking.c\
+mlmmj_unsubscribe_SOURCES = mlmmj-unsubscribe.c writen.c readln.c mylocking.c\
 			getlistaddr.c chomp.c subscriberfuncs.c random-int.c \
 			strgen.c print-version.c
--- a/src/Makefile.in	Thu Apr 22 06:18:22 2004 +1000
+++ b/src/Makefile.in	Thu Apr 22 06:20:34 2004 +1000
@@ -79,12 +79,12 @@
 am_mlmmj_subscribe_OBJECTS = mlmmj-subscribe.$(OBJEXT) \
 	writen.$(OBJEXT) mylocking.$(OBJEXT) getlistaddr.$(OBJEXT) \
 	chomp.$(OBJEXT) random-int.$(OBJEXT) strgen.$(OBJEXT) \
-	subscriberfuncs.$(OBJEXT) getline.$(OBJEXT) \
+	subscriberfuncs.$(OBJEXT) readln.$(OBJEXT) \
 	print-version.$(OBJEXT)
 mlmmj_subscribe_OBJECTS = $(am_mlmmj_subscribe_OBJECTS)
 mlmmj_subscribe_LDADD = $(LDADD)
 am_mlmmj_unsubscribe_OBJECTS = mlmmj-unsubscribe.$(OBJEXT) \
-	writen.$(OBJEXT) getline.$(OBJEXT) mylocking.$(OBJEXT) \
+	writen.$(OBJEXT) readln.$(OBJEXT) mylocking.$(OBJEXT) \
 	getlistaddr.$(OBJEXT) chomp.$(OBJEXT) \
 	subscriberfuncs.$(OBJEXT) random-int.$(OBJEXT) \
 	strgen.$(OBJEXT) print-version.$(OBJEXT)
@@ -97,7 +97,7 @@
 am__depfiles_maybe = depfiles
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/checkwait_smtpreply.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/chomp.Po ./$(DEPDIR)/find_email_adr.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/getline.Po ./$(DEPDIR)/getlistaddr.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/getlistaddr.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/header_token.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/incindexfile.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/init_sockfd.Po ./$(DEPDIR)/itoa.Po \
@@ -110,8 +110,8 @@
 @AMDEP_TRUE@	./$(DEPDIR)/mlmmj-unsubscribe.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/mylocking.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/print-version.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/random-int.Po ./$(DEPDIR)/send_help.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/strgen.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/random-int.Po ./$(DEPDIR)/readln.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/send_help.Po ./$(DEPDIR)/strgen.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/strip_file_to_fd.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/subscriberfuncs.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/writen.Po
@@ -218,9 +218,9 @@
 
 mlmmj_subscribe_SOURCES = mlmmj-subscribe.c writen.c mylocking.c \
 			getlistaddr.c chomp.c random-int.c strgen.c \
-			subscriberfuncs.c getline.c print-version.c
+			subscriberfuncs.c readln.c print-version.c
 
-mlmmj_unsubscribe_SOURCES = mlmmj-unsubscribe.c writen.c getline.c mylocking.c\
+mlmmj_unsubscribe_SOURCES = mlmmj-unsubscribe.c writen.c readln.c mylocking.c\
 			getlistaddr.c chomp.c subscriberfuncs.c random-int.c \
 			strgen.c print-version.c
 
@@ -324,7 +324,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkwait_smtpreply.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chomp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/find_email_adr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getline.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getlistaddr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/header_token.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/incindexfile.Po@am__quote@
@@ -340,6 +339,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mylocking.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-version.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/random-int.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readln.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/send_help.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strgen.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strip_file_to_fd.Po@am__quote@
--- a/src/mlmmj-recieve.c	Thu Apr 22 06:18:22 2004 +1000
+++ b/src/mlmmj-recieve.c	Thu Apr 22 06:20:34 2004 +1000
@@ -43,12 +43,11 @@
 {
 	char *infilename;
 	int mailfd;
-	int opt;
+	int opt, ch, process = 1;
 	char *listdir = 0;
 	char listadr[READ_BUFSIZE];
-/*	char *scanbuf; */
 	
-	while ((opt = getopt(argc, argv, "hVL:")) != -1) {
+	while ((opt = getopt(argc, argv, "hVPL:")) != -1) {
 		switch(opt) {
 		case 'h':
 			print_help(argv[0]);
@@ -56,6 +55,9 @@
 		case 'L':
 			listdir = optarg;
 			break;
+		case 'P':
+			process = 0;
+			break;
 		case 'V':
 			print_version(argv[0]);
 			exit(0);
@@ -86,17 +88,20 @@
 
 	printf("%s\n", infilename);
 	
-	/* strip_file_to_fd with 0, 0, 0, 0 as last arg just saves the file */
-	strip_file_to_fd(stdin, mailfd, 0, 0, 0, 0);
+	while((ch = getc(stdin)) != EOF)
+		writen(mailfd, &ch, 1);
 
 	close(mailfd);
-	close(mailfd);
+
+	if(!process)
+		return EXIT_SUCCESS;
 
 	execlp(BINDIR"mlmmj-process", "mlmmj-process",
 				"-L", listdir,
 				"-m", infilename, 0);
 
-	fprintf(stderr, "%s:%d execlp() of "BINDIR"mlmmj-send failed: ", __FILE__, __LINE__);
+	fprintf(stderr, "%s:%d execlp() of "BINDIR"mlmmj-send failed: ",
+			__FILE__, __LINE__);
 	perror(NULL);
 	return EXIT_FAILURE;
 }
--- a/src/readln.c	Thu Apr 22 06:18:22 2004 +1000
+++ b/src/readln.c	Thu Apr 22 06:20:34 2004 +1000
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <errno.h>
 #include "readln.h"
 
 /*! Read a line from filedescriptor fd. If bufsize-1 have been read and no