===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/uniq/uniq.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -c -r1.30 -r1.31
*** src/usr.bin/uniq/uniq.c	2021/12/24 17:59:28	1.30
--- src/usr.bin/uniq/uniq.c	2022/01/01 02:20:38	1.31
***************
*** 1,4 ****
! /*	$OpenBSD: uniq.c,v 1.30 2021/12/24 17:59:28 cheloha Exp $	*/
  /*	$NetBSD: uniq.c,v 1.7 1995/08/31 22:03:48 jtc Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: uniq.c,v 1.31 2022/01/01 02:20:38 cheloha Exp $	*/
  /*	$NetBSD: uniq.c,v 1.7 1995/08/31 22:03:48 jtc Exp $	*/
  
  /*
***************
*** 48,55 ****
  int cflag, dflag, iflag, uflag;
  int numchars, numfields, repeats;
  
! FILE	*file(char *, char *);
! void	 show(FILE *, char *);
  char	*skip(char *);
  void	 obsolete(char *[]);
  __dead void	usage(void);
--- 48,54 ----
  int cflag, dflag, iflag, uflag;
  int numchars, numfields, repeats;
  
! void	 show(const char *);
  char	*skip(char *);
  void	 obsolete(char *[]);
  __dead void	usage(void);
***************
*** 58,64 ****
  main(int argc, char *argv[])
  {
  	char *p, *prevline, *t, *thisline, *tmp;
- 	FILE *ifp = NULL, *ofp = NULL;
  	size_t prevsize, thissize, tmpsize;
  	ssize_t len;
  	int ch;
--- 57,62 ----
***************
*** 112,142 ****
  	if (!dflag && !uflag)
  		dflag = uflag = 1;
  
! 	switch (argc) {
! 	case 0:
! 		ifp = stdin;
! 		ofp = stdout;
! 		break;
! 	case 1:
! 		ifp = file(argv[0], "r");
! 		ofp = stdout;
! 		break;
! 	case 2:
! 		ifp = file(argv[0], "r");
! 		ofp = file(argv[1], "w");
! 		break;
! 	default:
  		usage();
  	}
  
  	if (pledge("stdio", NULL) == -1)
  		err(1, "pledge");
  
  	prevsize = 0;
  	prevline = NULL;
! 	if ((len = getline(&prevline, &prevsize, ifp)) == -1) {
  		free(prevline);
! 		if (ferror(ifp))
  			err(1, "getline");
  		exit(0);
  	}
--- 110,134 ----
  	if (!dflag && !uflag)
  		dflag = uflag = 1;
  
! 	if (argc > 2)
  		usage();
+ 	if (argc >= 1 && strcmp(argv[0], "-") != 0) {
+ 		if (freopen(argv[0], "r", stdin) == NULL)
+ 			err(1, "%s", argv[0]);
  	}
+ 	if (argc == 2 && strcmp(argv[1], "-") != 0) {
+ 		if (freopen(argv[1], "w", stdout) == NULL)
+ 			err(1, "%s", argv[1]);
+ 	}
  
  	if (pledge("stdio", NULL) == -1)
  		err(1, "pledge");
  
  	prevsize = 0;
  	prevline = NULL;
! 	if ((len = getline(&prevline, &prevsize, stdin)) == -1) {
  		free(prevline);
! 		if (ferror(stdin))
  			err(1, "getline");
  		exit(0);
  	}
***************
*** 149,155 ****
  	
  	thissize = 0;
  	thisline = NULL;
! 	while ((len = getline(&thisline, &thissize, ifp)) != -1) {
  		if (thisline[len - 1] == '\n')
  			thisline[len - 1] = '\0';
  
--- 141,147 ----
  	
  	thissize = 0;
  	thisline = NULL;
! 	while ((len = getline(&thisline, &thissize, stdin)) != -1) {
  		if (thisline[len - 1] == '\n')
  			thisline[len - 1] = '\0';
  
***************
*** 161,167 ****
  
  		/* If different, print; set previous to new value. */
  		if ((iflag ? strcasecmp : strcmp)(p, t)) {
! 			show(ofp, prevline);
  			tmp = prevline;
  			prevline = thisline;
  			thisline = tmp;
--- 153,159 ----
  
  		/* If different, print; set previous to new value. */
  		if ((iflag ? strcasecmp : strcmp)(p, t)) {
! 			show(prevline);
  			tmp = prevline;
  			prevline = thisline;
  			thisline = tmp;
***************
*** 176,185 ****
  			++repeats;
  	}
  	free(thisline);
! 	if (ferror(ifp))
  		err(1, "getline");
  
! 	show(ofp, prevline);
  	free(prevline);
  
  	exit(0);
--- 168,177 ----
  			++repeats;
  	}
  	free(thisline);
! 	if (ferror(stdin))
  		err(1, "getline");
  
! 	show(prevline);
  	free(prevline);
  
  	exit(0);
***************
*** 191,203 ****
   *	of the line.
   */
  void
! show(FILE *ofp, char *str)
  {
  	if ((dflag && repeats) || (uflag && !repeats)) {
  		if (cflag)
! 			fprintf(ofp, "%4d %s\n", repeats + 1, str);
  		else
! 			fprintf(ofp, "%s\n", str);
  	}
  }
  
--- 183,195 ----
   *	of the line.
   */
  void
! show(const char *str)
  {
  	if ((dflag && repeats) || (uflag && !repeats)) {
  		if (cflag)
! 			printf("%4d %s\n", repeats + 1, str);
  		else
! 			printf("%s\n", str);
  	}
  }
  
***************
*** 231,248 ****
  			len = 1;
  
  	return (str);
- }
- 
- FILE *
- file(char *name, char *mode)
- {
- 	FILE *fp;
- 
- 	if (strcmp(name, "-") == 0)
- 		return(*mode == 'r' ? stdin : stdout);
- 	if ((fp = fopen(name, mode)) == NULL)
- 		err(1, "%s", name);
- 	return (fp);
  }
  
  void
--- 223,228 ----