X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=contrib%2Fnotmuch-deliver%2Fsrc%2Fmain.c;h=6f32f73d68b97decbe382b3dc84cffc3e99f259d;hb=be2263e93035e778968e92d1b4db0166686be71b;hp=7c314911e7afa574f4c1b64b19cc910ea2eea0b9;hpb=73258fec796b57c757e10b0baec306157a69edeb;p=notmuch

diff --git a/contrib/notmuch-deliver/src/main.c b/contrib/notmuch-deliver/src/main.c
index 7c314911..6f32f73d 100644
--- a/contrib/notmuch-deliver/src/main.c
+++ b/contrib/notmuch-deliver/src/main.c
@@ -1,22 +1,23 @@
-/* vim: set cino= fo=croql sw=8 ts=8 sts=0 noet cin fdm=syntax : */
-
-/*
- * Copyright (c) 2010 Ali Polatel <alip@exherbo.org>
+/* notmuch-deliver - If you make the user a promise... make sure you deliver it!
+ *
+ * Copyright © 2010 Ali Polatel
  * Based in part upon deliverquota of maildrop which is:
  *   Copyright 1998 - 2009 Double Precision, Inc.
  *
- * This file is part of the notmuch-deliver. notmuch-deliver is free software;
- * you can redistribute it and/or modify it under the terms of the GNU General
- * Public License version 2, as published by the Free Software Foundation.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * notmuch-deliver is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ *
+ * Author: Ali Polatel <polatel@gmail.com>
  */
 
 #ifdef HAVE_CONFIG_H
@@ -167,8 +168,7 @@ save_splice(int fdin, int fdout)
 		do {
 			written = splice(pfd[0], NULL, fdout, NULL, ret, 0);
 			if (!written) {
-				g_critical("Splicing data to temporary file failed: %s",
-					g_strerror(errno));
+				g_critical("Splicing data to temporary file failed: internal error");
 				close(pfd[0]);
 				close(pfd[1]);
 				return EX_IOERR;
@@ -194,7 +194,7 @@ static int
 save_readwrite(int fdin, int fdout)
 {
 	int ret, written;
-	char buf[4096], p;
+	char buf[4096], *p;
 
 	for (;;) {
 		ret = read(fdin, buf, 4096);
@@ -415,6 +415,11 @@ main(int argc, char **argv)
 	}
 	g_free(conf_path);
 
+	if ((argc - 1) > 1) {
+		g_critical("Won't deliver to %d folders", argc - 1);
+		return EX_USAGE;
+	}
+
 	if (argc > 1) {
 		folder = g_strdup_printf("%s%s", opt_folder ? "." : "", argv[1]);
 		maildir = g_build_filename(db_path, folder, NULL);