X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fslocal.c;h=869fa17f81a3a4ca51816059451d6e597e44af33;hb=bfad64befb4d6696fdfb63b119666eec4bac6fb3;hp=44e5988d0194f8a7314a69b1ab76941f4c217e93;hpb=cfbb7d214978767f9bab016a5c00f44680126063;p=mmh

diff --git a/uip/slocal.c b/uip/slocal.c
index 44e5988..869fa17 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -25,6 +25,7 @@
 #include <h/dropsbr.h>
 #include <h/rcvmail.h>
 #include <h/signals.h>
+#include <setjmp.h>
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/utils.h>
@@ -44,21 +45,15 @@
  * harmless.
  */
 #define DB_DBM_HSEARCH 1
+#ifdef DB_DBM_HSEARCH
+#endif /* Use DB_DBM_HSEARCH to prevent warning from gcc -Wunused-macros. */
 #ifdef NDBM_HEADER
 #include NDBM_HEADER
 #endif
 
-#include <utmp.h>
-
-#ifndef HAVE_GETUTENT
-# ifndef UTMP_FILE
-#  ifdef _PATH_UTMP
-#   define UTMP_FILE _PATH_UTMP
-#  else
-#   define UTMP_FILE "/etc/utmp"
-#  endif
-# endif
-#endif
+#ifdef HAVE_GETUTXENT
+#include <utmpx.h>
+#endif /* HAVE_GETUTXENT */
 
 static struct swit switches[] = {
 #define	ADDRSW         0
@@ -227,13 +222,12 @@ main (int argc, char **argv)
 		    adios (NULL, "-%s unknown", cp);
 
 		case HELPSW: 
-		    snprintf (buf, sizeof(buf),
-			"%s [switches] [address info sender]", invo_name);
+		    snprintf (buf, sizeof(buf), "%s [switches]", invo_name);
 		    print_help (buf, switches, 0);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case ADDRSW: 
 		    if (!(addr = *argp++))/* allow -xyz arguments */
@@ -289,20 +283,8 @@ main (int argc, char **argv)
 		    debug++;
 		    continue;
 	    }
-	}
-
-	switch (argp - (argv + 1)) {
-	    case 1: 
-		addr = cp;
-		break;
-
-	    case 2: 
-		info = cp;
-		break;
-
-	    case 3: 
-		sender = cp;
-		break;
+	} else {
+		adios (NULL, "only switch arguments are supported");
 	}
     }
 
@@ -934,62 +916,31 @@ lookup (struct pair *pairs, char *key)
  * logged in.
  */
 
-#ifdef HAVE_GETUTENT
 static int
 logged_in (void)
 {
-    struct utmp * utp;
+#if HAVE_GETUTXENT
+    struct utmpx *utp;
 
     if (utmped)
         return utmped;
 
-    setutent();
+    setutxent();
 
-    while ((utp = getutent()) != NULL) {
-        if (
-#ifdef HAVE_STRUCT_UTMP_UT_TYPE
-		utp->ut_type == USER_PROCESS
-                &&
-#endif
-		utp->ut_name[0] != 0
-                && strncmp (user, utp->ut_name, sizeof(utp->ut_name)) == 0) {
+    while ((utp = getutxent()) != NULL) {
+        if ( utp->ut_type == USER_PROCESS && utp->ut_user[0] != 0
+                && strncmp (user, utp->ut_user, sizeof(utp->ut_user)) == 0) {
             if (debug)
                 continue;
-            endutent();
+            endutxent();
             return (utmped = DONE);
         }
     }
 
-    endutent();
+    endutxent();
+#endif /* HAVE_GETUTXENT */
     return (utmped = NOTOK);
 }
-#else
-static int
-logged_in (void)
-{
-    struct utmp ut;
-    FILE *uf;
-
-    if (utmped)
-	return utmped;
-
-    if ((uf = fopen (UTMP_FILE, "r")) == NULL)
-	return NOTOK;
-
-    while (fread ((char *) &ut, sizeof(ut), 1, uf) == 1) {
-	if (ut.ut_name[0] != 0
-	    && strncmp (user, ut.ut_name, sizeof(ut.ut_name)) == 0) {
-	    if (debug)
-		continue;
-	    fclose (uf);
-	    return (utmped = DONE);
-	}
-    }
-
-    fclose (uf);
-    return (utmped = NOTOK);
-}
-#endif
 
 #define	check(t,a,b)		if (t < a || t > b) return -1
 #define	cmpar(h1,m1,h2,m2)	if (h1 < h2 || (h1 == h2 && m1 < m2)) return 0
@@ -1093,18 +1044,6 @@ usr_folder (int fd, char *string)
     /* use rcvstore to put message in folder */
     status = usr_pipe (fd, "rcvstore", rcvstoreproc, vec, 1);
 
-#if 0
-    /*
-     * Currently, verbose status messages are handled by usr_pipe().
-     */
-    if (verbose) {
-	if (status == 0)
-	    verbose_printf (", success.\n");
-	else
-	    verbose_printf (", failed.\n");
-    }
-#endif
-
     return status;
 }
 
@@ -1163,7 +1102,7 @@ usr_pipe (int fd, char *cmd, char *pgm, char **vec, int suppress)
 
 	default: 
 	    /* parent process */
-	    if (!setjmp (myctx)) {
+	    if (! setjmp (myctx)) {
 		SIGNAL (SIGALRM, alrmser);
 		bytes = fstat (fd, &st) != -1 ? (int) st.st_size : 100;
 
@@ -1208,6 +1147,8 @@ usr_pipe (int fd, char *cmd, char *pgm, char **vec, int suppress)
 static void
 alrmser (int i)
 {
+    NMH_UNUSED (i);
+
     longjmp (myctx, DONE);
 }
 
@@ -1324,13 +1265,6 @@ you_lose:
 		/* get copy of envelope information ("From " line) */
 		envelope = getcpy (buffer);
 
-#if 0
-		/* First go ahead and put "From " line in message */
-		fputs (buffer, ffp);
-		if (ferror (ffp))
-		    goto fputs_error;
-#endif
-
 		/* Put the delivery date in message */
 		fputs (ddate, ffp);
 		if (ferror (ffp))