add support for -f - (read stdin)

(code from Marc Horowitz)

1 files changed, 22 insertions, 16 deletions

diff --git a/clients/znol/znol.c b/clients/znol/znol.c
index 826add2..4af99b6 100644
--- a/clients/znol/znol.c
+++ b/clients/znol/znol.c
@@ -47,19 +47,6 @@ main(argc,argv)
 		exit (1);
 	}
 
-	envptr = getenv("HOME");
-	if (envptr)
-		(void) strcpy(anyonename,envptr);
-	else {
-		if (!(pwd = getpwuid((int) getuid()))) {
-			fprintf(stderr,"Who are you?\n");
-			exit (1);
-		}
-
-		(void) strcpy(anyonename,pwd->pw_dir);
-	} 
-	(void) strcat(anyonename,"/.anyone");
-
 	for (arg=1;arg<argc;arg++) {
 		if (!strcmp(argv[arg],"on")) {
 			onoff = ON;
@@ -114,10 +101,29 @@ main(argc,argv)
 			exit(1);
 		}
 	
+	if (!useronly) {
+		/* If no filename specified, get the default */
+		if (!filenamed) {
+			envptr = getenv("HOME");
+			if (envptr)
+			    (void) strcpy(anyonename,envptr);
+			else {
+				if (!(pwd = getpwuid((int) getuid()))) {
+					fprintf(stderr,"You are not listed in the password file.\n");
+					exit (1);
+				}
+				(void) strcpy(anyonename,pwd->pw_dir);
+			}
+			(void) strcat(anyonename,"/.anyone");
+		}
 
-	if (!useronly && !(fp = fopen(anyonename,"r"))) {
-		fprintf(stderr,"Can't open %s for input\n",anyonename);
-		exit (1);
+		/* if the filename is "-", read stdin */
+		if (strcmp(anyonename,"-") == 0) {
+			fp = stdin;
+		} else if (!(fp = fopen(anyonename,"r"))) {
+			fprintf(stderr,"Can't open %s for input\n",anyonename);
+			exit (1);
+		}
 	}
 
 	ind = 0;