From d43f76154bdfa1deafd46a37dc2310fcaa67b11c Mon Sep 17 00:00:00 2001 From: Alex Hornung Date: Sat, 12 Sep 2009 08:58:21 +0100 Subject: [PATCH] ptsname,posix_openpt - move to libc/stdlib * As the unix98 pty functions ptsname, grantpt, unlockpt and posix_openpt are part of stdlib, it makes more sense having them in stdlib/ rather than in gen/. --- lib/libc/gen/Makefile.inc | 7 +++---- lib/libc/stdlib/Makefile.inc | 6 ++++-- lib/libc/{gen => stdlib}/posix_openpt.3 | 0 lib/libc/{gen => stdlib}/ptsname.3 | 0 lib/libc/{gen => stdlib}/ptsname.c | 0 5 files changed, 7 insertions(+), 6 deletions(-) rename lib/libc/{gen => stdlib}/posix_openpt.3 (100%) rename lib/libc/{gen => stdlib}/ptsname.3 (100%) rename lib/libc/{gen => stdlib}/ptsname.c (100%) diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index bafe3d198a..4a7c246347 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -24,7 +24,7 @@ SRCS+= _pthread_stubs.c _rand48.c _spinlock_stub.c _thread_init.c \ lockf.c lrand48.c mrand48.c msgctl.c \ msgget.c msgrcv.c msgsnd.c nftw.c nice.c \ nlist.c nrand48.c ntp_gettime.c opendir.c \ - pause.c pmadvise.c popen.c posix_spawn.c posixshm.c ptsname.c \ + pause.c pmadvise.c popen.c posix_spawn.c posixshm.c \ psignal.c pw_scan.c pwcache.c \ raise.c readdir.c readpassphrase.c rewinddir.c \ scandir.c seed48.c seekdir.c semconfig.c semctl.c semget.c semop.c \ @@ -64,12 +64,12 @@ MAN+= alarm.3 arc4random.3 clock.3 \ iscntrl.3 isdigit.3 isgraph.3 islower.3 isprint.3 ispunct.3 \ isspace.3 isupper.3 isxdigit.3 isinf.3 isfinite.3 isnan.3 isnormal.3 \ ldexp.3 lockf.3 makecontext.3 modf.3 msgctl.3 msgget.3 msgrcv.3 msgsnd.3 \ - nice.3 nlist.3 pause.3 popen.3 posix_openpt.3 posix_spawn.3 \ + nice.3 nlist.3 pause.3 popen.3 posix_spawn.3 \ posix_spawn_file_actions_addopen.3 posix_spawn_file_actions_init.3 \ posix_spawnattr_getflags.3 posix_spawnattr_getpgroup.3 \ posix_spawnattr_getschedparam.3 posix_spawnattr_getschedpolicy.3 \ posix_spawnattr_getsigdefault.3 posix_spawnattr_getsigmask.3 \ - posix_spawnattr_init.3 psignal.3 ptsname.3 pwcache.3 \ + posix_spawnattr_init.3 psignal.3 pwcache.3 \ raise.3 rand48.3 readpassphrase.3 rfork_thread.3 \ scandir.3 setjmp.3 setmode.3 setproctitle.3 shm_open.3 \ siginterrupt.3 signal.3 signbit.3 sigsetops.3 sleep.3 stringlist.3 \ @@ -142,7 +142,6 @@ MLINKS+=posix_spawnattr_getsigmask.3 posix_spawnattr_setsigmask.3 MLINKS+=posix_spawnattr_init.3 posix_spawnattr_destroy.3 MLINKS+=psignal.3 strsignal.3 psignal.3 sys_nsig.3 psignal.3 sys_siglist.3 \ psignal.3 sys_signame.3 -MLINKS+=ptsname.3 grantpt.3 ptsname.3 unlockpt.3 MLINKS+=pwcache.3 group_from_gid.3 pwcache.3 user_from_uid.3 MLINKS+=rand48.3 drand48.3 rand48.3 erand48.3 \ rand48.3 jrand48.3 rand48.3 lcong48.3 rand48.3 lrand48.3 \ diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc index 61590b3ded..d174603d26 100644 --- a/lib/libc/stdlib/Makefile.inc +++ b/lib/libc/stdlib/Makefile.inc @@ -9,7 +9,7 @@ MISRCS+=a64l.c abort.c abs.c atexit.c atof.c atoi.c atol.c atoll.c \ bsearch.c div.c exit.c getenv.c getopt.c getopt_long.c \ getsubopt.c hcreate.c heapsort.c imaxabs.c imaxdiv.c \ insque.c l64a.c labs.c ldiv.c llabs.c lldiv.c lsearch.c nmalloc.c \ - merge.c qsort.c qsort_r.c radixsort.c rand.c random.c \ + merge.c ptsname.c qsort.c qsort_r.c radixsort.c rand.c random.c \ reallocf.c realpath.c remque.c strfmon.c strtoimax.c \ strtol.c strtoll.c strtonum.c strtoq.c strtoul.c strtoull.c \ strtoumax.c strtouq.c system.c tdelete.c tfind.c tsearch.c twalk.c @@ -23,7 +23,8 @@ MISRCS+=a64l.c abort.c abs.c atexit.c atof.c atoi.c atol.c atoll.c \ MAN+= a64l.3 abort.3 abs.3 alloca.3 atexit.3 atof.3 atoi.3 atol.3 bsearch.3 \ div.3 exit.3 getenv.3 getopt.3 getopt_long.3 getsubopt.3 \ hcreate.3 imaxabs.3 imaxdiv.3 insque.3 labs.3 ldiv.3 llabs.3 lldiv.3 \ - lsearch.3 malloc.3 memory.3 posix_memalign.3 qsort.3 \ + lsearch.3 malloc.3 memory.3 posix_memalign.3 posix_openpt.3 \ + ptsname.3 qsort.3 \ radixsort.3 rand.3 random.3 \ realpath.3 strfmon.3 strtod.3 strtol.3 strtonum.3 strtoul.3 system.3 \ tsearch.3 @@ -37,6 +38,7 @@ MLINKS+=hcreate.3 hdestroy.3 hcreate.3 hsearch.3 MLINKS+=insque.3 remque.3 MLINKS+=lsearch.3 lfind.3 MLINKS+=malloc.3 calloc.3 malloc.3 free.3 malloc.3 realloc.3 malloc.3 reallocf.3 +MLINKS+=ptsname.3 grantpt.3 ptsname.3 unlockpt.3 MLINKS+=qsort.3 heapsort.3 qsort.3 mergesort.3 qsort.3 qsort_r.3 MLINKS+=radixsort.3 sradixsort.3 MLINKS+=rand.3 rand_r.3 rand.3 srand.3 rand.3 sranddev.3 diff --git a/lib/libc/gen/posix_openpt.3 b/lib/libc/stdlib/posix_openpt.3 similarity index 100% rename from lib/libc/gen/posix_openpt.3 rename to lib/libc/stdlib/posix_openpt.3 diff --git a/lib/libc/gen/ptsname.3 b/lib/libc/stdlib/ptsname.3 similarity index 100% rename from lib/libc/gen/ptsname.3 rename to lib/libc/stdlib/ptsname.3 diff --git a/lib/libc/gen/ptsname.c b/lib/libc/stdlib/ptsname.c similarity index 100% rename from lib/libc/gen/ptsname.c rename to lib/libc/stdlib/ptsname.c -- 2.41.0