From 3cb1b7a60aa0d1c5e2de86620eca8180d9a4c93d Mon Sep 17 00:00:00 2001 From: millert Date: Fri, 19 Jan 2024 16:30:28 +0000 Subject: [PATCH] Move mktemp.c to stdlib where it belongs. OK deraadt@ --- lib/libc/stdio/Makefile.inc | 6 +++--- lib/libc/stdlib/Makefile.inc | 8 ++++---- lib/libc/{stdio => stdlib}/mktemp.3 | 4 ++-- lib/libc/{stdio => stdlib}/mktemp.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) rename lib/libc/{stdio => stdlib}/mktemp.3 (98%) rename lib/libc/{stdio => stdlib}/mktemp.c (98%) diff --git a/lib/libc/stdio/Makefile.inc b/lib/libc/stdio/Makefile.inc index 00ae1b2c2b6..356e3fc956f 100644 --- a/lib/libc/stdio/Makefile.inc +++ b/lib/libc/stdio/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.29 2016/03/30 06:38:41 jmc Exp $ +# $OpenBSD: Makefile.inc,v 1.30 2024/01/19 16:30:28 millert Exp $ # stdio sources .PATH: ${LIBCSRCDIR}/stdio @@ -9,7 +9,7 @@ SRCS+= asprintf.c clrerr.c fclose.c fdopen.c feof.c ferror.c fflush.c fgetc.c \ fgetln.c fgetpos.c fgets.c fileno.c findfp.c flags.c fmemopen.c \ fopen.c fprintf.c fpurge.c fputc.c fputs.c fread.c freopen.c fscanf.c \ fseek.c fsetpos.c ftell.c funopen.c fvwrite.c fwalk.c fwrite.c \ - getc.c getchar.c getw.c makebuf.c mktemp.c open_memstream.c \ + getc.c getchar.c getw.c makebuf.c open_memstream.c \ open_wmemstream.c perror.c printf.c putc.c putchar.c puts.c putw.c \ refill.c remove.c rewind.c rget.c scanf.c setbuf.c setbuffer.c \ setvbuf.c snprintf.c sprintf.c sscanf.c stdio.c tempnam.c tmpfile.c \ @@ -22,7 +22,7 @@ SRCS+= asprintf.c clrerr.c fclose.c fdopen.c feof.c ferror.c fflush.c fgetc.c \ getdelim.c getline.c dprintf.c vdprintf.c MAN+= fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetwln.3 fmemopen.3 \ - fopen.3 fputs.3 fread.3 fseek.3 funopen.3 getc.3 mktemp.3 \ + fopen.3 fputs.3 fread.3 fseek.3 funopen.3 getc.3 \ open_memstream.3 perror.3 printf.3 putc.3 remove.3 scanf.3 setbuf.3 \ setvbuf.3 stdio.3 tmpnam.3 ungetc.3 fgetws.3 fputws.3 fwide.3 getwc.3 \ putwc.3 ungetwc.3 wprintf.3 wscanf.3 getdelim.3 diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc index 55b80185222..fa4836f42bb 100644 --- a/lib/libc/stdlib/Makefile.inc +++ b/lib/libc/stdlib/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.64 2017/12/16 20:06:55 guenther Exp $ +# $OpenBSD: Makefile.inc,v 1.65 2024/01/19 16:30:28 millert Exp $ # stdlib sources .PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/stdlib ${LIBCSRCDIR}/stdlib @@ -6,7 +6,7 @@ SRCS+= a64l.c abort.c atexit.c atoi.c atof.c atol.c atoll.c bsearch.c \ exit.c ecvt.c gcvt.c getenv.c getopt_long.c \ getsubopt.c hcreate.c heapsort.c imaxabs.c imaxdiv.c insque.c \ - l64a.c llabs.c lldiv.c lsearch.c malloc.c reallocarray.c \ + l64a.c llabs.c lldiv.c lsearch.c malloc.c mktemp.c reallocarray.c \ merge.c posix_pty.c qsort.c radixsort.c rand.c random.c \ realpath.c remque.c setenv.c strtoimax.c \ strtol.c strtoll.c strtonum.c strtoul.c strtoull.c strtoumax.c \ @@ -28,6 +28,6 @@ SRCS+= abs.c div.c labs.c ldiv.c MAN+= a64l.3 abort.3 abs.3 alloca.3 atexit.3 atof.3 atoi.3 atol.3 atoll.3 \ bsearch.3 div.3 ecvt.3 exit.3 getenv.3 getopt.3 getopt_long.3 \ getsubopt.3 hcreate.3 imaxabs.3 imaxdiv.3 insque.3 labs.3 ldiv.3 \ - lldiv.3 lsearch.3 malloc.3 posix_memalign.3 posix_openpt.3 ptsname.3 \ - qsort.3 radixsort.3 rand48.3 rand.3 random.3 realpath.3 \ + lldiv.3 lsearch.3 malloc.3 mktemp.3 posix_memalign.3 posix_openpt.3 \ + ptsname.3 qsort.3 radixsort.3 rand48.3 rand.3 random.3 realpath.3 \ strtod.3 strtonum.3 strtol.3 strtoul.3 system.3 tsearch.3 diff --git a/lib/libc/stdio/mktemp.3 b/lib/libc/stdlib/mktemp.3 similarity index 98% rename from lib/libc/stdio/mktemp.3 rename to lib/libc/stdlib/mktemp.3 index 050a5c8cb44..d4bd7bdc91b 100644 --- a/lib/libc/stdio/mktemp.3 +++ b/lib/libc/stdlib/mktemp.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mktemp.3,v 1.56 2022/08/04 06:20:24 jsg Exp $ +.\" $OpenBSD: mktemp.3,v 1.1 2024/01/19 16:30:28 millert Exp $ .\" .\" Copyright (c) 1989, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: August 4 2022 $ +.Dd $Mdocdate: January 19 2024 $ .Dt MKTEMP 3 .Os .Sh NAME diff --git a/lib/libc/stdio/mktemp.c b/lib/libc/stdlib/mktemp.c similarity index 98% rename from lib/libc/stdio/mktemp.c rename to lib/libc/stdlib/mktemp.c index ef9a1836107..3b8bba78463 100644 --- a/lib/libc/stdio/mktemp.c +++ b/lib/libc/stdlib/mktemp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mktemp.c,v 1.39 2017/11/28 06:55:49 tb Exp $ */ +/* $OpenBSD: mktemp.c,v 1.1 2024/01/19 16:30:28 millert Exp $ */ /* * Copyright (c) 1996-1998, 2008 Theo de Raadt * Copyright (c) 1997, 2008-2009 Todd C. Miller -- 2.20.1