===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mktemp/mktemp.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/mktemp/mktemp.c	2001/10/01 17:08:30	1.6
--- src/usr.bin/mktemp/mktemp.c	2001/10/11 00:05:55	1.7
***************
*** 1,4 ****
! /*	$OpenBSD: mktemp.c,v 1.6 2001/10/01 17:08:30 millert Exp $	*/
  
  /*
   * Copyright (c) 1996, 1997, 2001 Todd C. Miller <Todd.Miller@courtesan.com>
--- 1,4 ----
! /*	$OpenBSD: mktemp.c,v 1.7 2001/10/11 00:05:55 millert Exp $	*/
  
  /*
   * Copyright (c) 1996, 1997, 2001 Todd C. Miller <Todd.Miller@courtesan.com>
***************
*** 28,34 ****
   */
  
  #ifndef lint                                                              
! static const char rcsid[] = "$OpenBSD: mktemp.c,v 1.6 2001/10/01 17:08:30 millert Exp $";
  #endif /* not lint */                                                        
  
  #include <paths.h>
--- 28,34 ----
   */
  
  #ifndef lint                                                              
! static const char rcsid[] = "$OpenBSD: mktemp.c,v 1.7 2001/10/11 00:05:55 millert Exp $";
  #endif /* not lint */                                                        
  
  #include <paths.h>
***************
*** 38,60 ****
  #include <unistd.h>
  #include <err.h>
  
! void
! usage()
! {
! 	extern char *__progname;
  
- 	(void) fprintf(stderr,
- 	    "Usage: %s [-dqtu] [-p prefix] template\n", __progname);
- 	exit(1);
- }
- 
  int
  main(argc, argv)
  	int argc;
  	char **argv;
  {
! 	int ch, uflag = 0, qflag = 0, tflag = 0, makedir = 0;
! 	char *cp, *template, *prefix = _PATH_TMP;
  	size_t plen;
  
  	while ((ch = getopt(argc, argv, "dp:qtu")) != -1)
--- 38,52 ----
  #include <unistd.h>
  #include <err.h>
  
! __dead void usage __P((void));
  
  int
  main(argc, argv)
  	int argc;
  	char **argv;
  {
! 	int ch, fd, uflag = 0, quiet = 0, tflag = 0, makedir = 0;
! 	char *cp, *template, *tempfile, *prefix = _PATH_TMP;
  	size_t plen;
  
  	while ((ch = getopt(argc, argv, "dp:qtu")) != -1)
***************
*** 67,73 ****
  			tflag = 1;
  			break;
  		case 'q':
! 			qflag = 1;
  			break;
  		case 't':
  			tflag = 1;
--- 59,65 ----
  			tflag = 1;
  			break;
  		case 'q':
! 			quiet = 1;
  			break;
  		case 't':
  			tflag = 1;
***************
*** 79,93 ****
  			usage();
  	}
  
! 	if (argc - optind != 1)
  		usage();
  
  	if (tflag) {
! 		if (strchr(argv[optind], '/')) {
! 			if (qflag)
! 				exit(1);
! 			else
! 				errx(1, "template must not contain directory separators in -t mode");
  		}
  
  		cp = getenv("TMPDIR");
--- 71,94 ----
  			usage();
  	}
  
! 	/* If no template specified use a default one (implies -t mode) */
! 	switch (argc - optind) {
! 	case 1:
! 		template = argv[optind];
! 		break;
! 	case 0:
! 		template = "tmp.XXXXXXXXXX";
! 		tflag = 1;
! 		break;
! 	default:
  		usage();
+ 	}
  
  	if (tflag) {
! 		if (strchr(template, '/')) {
! 			if (!quiet)
! 				warnx("template must not contain directory separators in -t mode");
! 			exit(1);
  		}
  
  		cp = getenv("TMPDIR");
***************
*** 97,145 ****
  		while (plen != 0 && prefix[plen - 1] == '/')
  			plen--;
  
! 		template = (char *)malloc(plen + 1 + strlen(argv[optind]) + 1);
! 		if (template == NULL) {
! 			if (qflag)
! 				exit(1);
! 			else
! 				errx(1, "Cannot allocate memory");
  		}
! 		memcpy(template, prefix, plen);
! 		template[plen] = '/';
! 		strcpy(template + plen + 1, argv[optind]);	/* SAFE */
  	} else {
! 		if ((template = strdup(argv[optind])) == NULL) {
! 			if (qflag)
! 				exit(1);
! 			else
! 				errx(1, "Cannot allocate memory");
  		}
  	}
  
  	if (makedir) {
! 		if (mkdtemp(template) == NULL) {
! 			if (qflag)
! 				exit(1);
! 			else
! 				err(1, "Cannot make temp dir %s", template);
  		}
  
  		if (uflag)
! 			(void) rmdir(template);
  	} else {
! 		if (mkstemp(template) < 0) {
! 			if (qflag)
! 				exit(1);
! 			else
! 				err(1, "Cannot create temp file %s", template);
  		}
  
  		if (uflag)
! 			(void) unlink(template);
  	}
  
! 	(void) puts(template);
! 	free(template);
  
  	exit(0);
  }
--- 98,153 ----
  		while (plen != 0 && prefix[plen - 1] == '/')
  			plen--;
  
! 		tempfile = (char *)malloc(plen + 1 + strlen(template) + 1);
! 		if (tempfile == NULL) {
! 			if (!quiet)
! 				warnx("cannot allocate memory");
! 			exit(1);
  		}
! 		(void)memcpy(tempfile, prefix, plen);
! 		tempfile[plen] = '/';
! 		(void)strcpy(tempfile + plen + 1, template);	/* SAFE */
  	} else {
! 		if ((tempfile = strdup(template)) == NULL) {
! 			if (!quiet)
! 				warnx("cannot allocate memory");
! 			exit(1);
  		}
  	}
  
  	if (makedir) {
! 		if (mkdtemp(tempfile) == NULL) {
! 			if (!quiet)
! 				warn("cannot make temp dir %s", tempfile);
! 			exit(1);
  		}
  
  		if (uflag)
! 			(void)rmdir(tempfile);
  	} else {
! 		if ((fd = mkstemp(tempfile)) < 0) {
! 			if (!quiet)
! 				warn("cannot make temp file %s", tempfile);
! 			exit(1);
  		}
+ 		(void)close(fd);
  
  		if (uflag)
! 			(void)unlink(tempfile);
  	}
  
! 	(void)puts(tempfile);
! 	free(tempfile);
  
  	exit(0);
+ }
+ 
+ __dead void
+ usage()
+ {
+ 	extern char *__progname;
+ 
+ 	(void)fprintf(stderr,
+ 	    "Usage: %s [-dqtu] [-p prefix] [template]\n", __progname);
+ 	exit(1);
  }