--- MITgcm/tools/mpack-1.6/unixpk.c	2003/08/26 20:45:25	1.1
+++ MITgcm/tools/mpack-1.6/unixpk.c	2008/02/23 01:28:27	1.2
@@ -23,23 +23,28 @@
  * SOFTWARE.
  */
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#include <getopt.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
 #include "common.h"
 #include "version.h"
 #include "xmalloc.h"
 
 #define MAXADDRESS 100
 
-extern char *getenv();
-
-extern int errno;
-extern int optind;
-extern char *optarg;
+extern int attachment;
 
 void usage(void);
 void sendmail(FILE *infile, char **addr, int start);
 void inews(FILE *infile);
+void os_perror(char *str);
+int encode(FILE *infile, FILE *applefile, char *fname, FILE *descfile,
+	   char *subject, char *headers, long int maxsize,
+	   char *typeoverride, char *outfname);
 
 int main(int argc, char **argv)
 {
@@ -64,7 +69,7 @@
 	maxsize = atoi(p);
     }
 
-    while ((opt = getopt(argc, argv, "s:d:m:c:o:n:")) != EOF) {
+    while ((opt = getopt(argc, argv, "as:d:m:c:o:n:")) != EOF) {
 	switch (opt) {
 	case 's':
 	    subject = optarg;
@@ -90,6 +95,10 @@
 	    newsgroups = optarg;
 	    break;
 
+	case 'a':
+	    attachment = 1;
+	    break;
+
 	default:
 	    usage();
 
@@ -155,7 +164,7 @@
 	    fprintf(stderr, "A subject is required\n");
 	    usage();
 	}
-	if (p = strchr(sbuf, '\n')) *p = '\0';
+	if ((p = strchr(sbuf, '\n'))) *p = '\0';
 	subject = sbuf;
     }	
 
@@ -164,7 +173,7 @@
 	    strcpy(fnamebuf, getenv("TMPDIR"));
 	}
 	else {
-	    strcpy(fnamebuf, "/usr/tmp");
+	    strcpy(fnamebuf, "/var/tmp");
 	}
 	strcat(fnamebuf, "/mpackXXXXXX");
 	mktemp(fnamebuf);