diff --git a/hacking b/hacking index 1114e56..86c03ba 160000 --- a/hacking +++ b/hacking @@ -1 +1 @@ -Subproject commit 1114e56fb6975e26fecd0466494105cbe42d8b85 +Subproject commit 86c03ba7e6b1fab1bbccd6aad1e72e1bf0a94317 diff --git a/sys/include/libc.h b/sys/include/libc.h index c824d23..40851a3 100644 --- a/sys/include/libc.h +++ b/sys/include/libc.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015-2017 Giacomo Tesio + * Copyright (C) 2015-2020 Giacomo Tesio * * This file is part of the UCB release of Plan 9. It is subject to the license * terms in the LICENSE file found in the top-level directory of this @@ -9,8 +9,8 @@ * in the LICENSE file. */ -#pragma lib "libc.a" -#pragma src "/sys/src/lib/c" +#pragma lib "libjehanne.a" +#pragma src "/sys/src/lib/jehanne" #define JEHANNE_LIBC /* only for native code */ @@ -614,8 +614,8 @@ extern Waitmsg* jehanne_wait(void); extern int jehanne_waitpid(void); extern int jehanne_wstat(const char*, uint8_t*, int); -extern int32_t jehanne_read(int, void*, int32_t); -extern int32_t jehanne_write(int, const void*, int32_t); +extern long jehanne_read(int, void*, int32_t); +extern long jehanne_write(int, const void*, int32_t); extern Dir* jehanne_dirstat(const char*); extern Dir* jehanne_dirfstat(int); diff --git a/sys/src/cmd/cmd.json b/sys/src/cmd/cmd.json index c710773..564c768 100644 --- a/sys/src/cmd/cmd.json +++ b/sys/src/cmd/cmd.json @@ -34,7 +34,7 @@ "-lthread", "-lbio", "-l9p2000", - "-lc" + "-ljehanne" ], "Post": [ "rm -f *.o" diff --git a/sys/src/cmd/cmds.json b/sys/src/cmd/cmds.json index 9742f04..fa65347 100644 --- a/sys/src/cmd/cmds.json +++ b/sys/src/cmd/cmds.json @@ -83,7 +83,7 @@ "Install": "/arch/$ARCH/cmd/", "Program": "mpc", "SourceFiles": [ - "/sys/src/lib/c/lib9.c", + "/sys/src/lib/jehanne/lib9.c", "mpc.c" ] }, diff --git a/sys/src/cmd/disk/prep/fdisk.json b/sys/src/cmd/disk/prep/fdisk.json index 02c00f0..7cfdb88 100644 --- a/sys/src/cmd/disk/prep/fdisk.json +++ b/sys/src/cmd/disk/prep/fdisk.json @@ -12,7 +12,7 @@ ], "Program": "fdisk", "SourceFiles": [ - "/sys/src/lib/c/lib9.c", + "/sys/src/lib/jehanne/lib9.c", "fdisk.c", "edit.c", "y.tab.c" diff --git a/sys/src/cmd/disk/prep/prep.json b/sys/src/cmd/disk/prep/prep.json index 1409ebc..3d0f56a 100644 --- a/sys/src/cmd/disk/prep/prep.json +++ b/sys/src/cmd/disk/prep/prep.json @@ -12,7 +12,7 @@ ], "Program": "prep", "SourceFiles": [ - "/sys/src/lib/c/lib9.c", + "/sys/src/lib/jehanne/lib9.c", "prep.c", "edit.c", "y.tab.c" diff --git a/sys/src/cmd/ed.c b/sys/src/cmd/ed.c index 139e764..86be702 100644 --- a/sys/src/cmd/ed.c +++ b/sys/src/cmd/ed.c @@ -133,9 +133,6 @@ void substitute(int); static Rune la; static Rune lr; -#undef read -extern int jehanne_read(int, void*, int); - void main(int argc, char *argv[]) { diff --git a/sys/src/cmd/grep/build.json b/sys/src/cmd/grep/build.json index 018c2f6..b573572 100644 --- a/sys/src/cmd/grep/build.json +++ b/sys/src/cmd/grep/build.json @@ -12,7 +12,7 @@ ], "Program": "grep", "SourceFiles": [ - "/sys/src/lib/c/lib9.c", + "/sys/src/lib/jehanne/lib9.c", "comp.c", "main.c", "sub.c", diff --git a/sys/src/cmd/hmi/console/comconsole.json b/sys/src/cmd/hmi/console/comconsole.json index 7696ec9..17fa846 100644 --- a/sys/src/cmd/hmi/console/comconsole.json +++ b/sys/src/cmd/hmi/console/comconsole.json @@ -7,7 +7,7 @@ "Oflags": [ "-static", "-l9p2000", - "-lc" + "-ljehanne" ], "Program": "comconsole", "SourceFiles": [ diff --git a/sys/src/cmd/hmi/console/pipeconsole.json b/sys/src/cmd/hmi/console/pipeconsole.json index 385f97b..c7bb478 100644 --- a/sys/src/cmd/hmi/console/pipeconsole.json +++ b/sys/src/cmd/hmi/console/pipeconsole.json @@ -7,7 +7,7 @@ "Oflags": [ "-static", "-l9p2000", - "-lc" + "-ljehanne" ], "Program": "pipeconsole", "SourceFiles": [ diff --git a/sys/src/cmd/hmi/console/screenconsole.json b/sys/src/cmd/hmi/console/screenconsole.json index 37d1982..3b566df 100644 --- a/sys/src/cmd/hmi/console/screenconsole.json +++ b/sys/src/cmd/hmi/console/screenconsole.json @@ -7,7 +7,7 @@ "Oflags": [ "-static", "-l9p2000", - "-lc" + "-ljehanne" ], "Program": "screenconsole", "SourceFiles": [ diff --git a/sys/src/cmd/hoc/build.json b/sys/src/cmd/hoc/build.json index d743343..09d83a7 100644 --- a/sys/src/cmd/hoc/build.json +++ b/sys/src/cmd/hoc/build.json @@ -12,7 +12,7 @@ ], "Program": "hoc", "SourceFiles": [ - "/sys/src/lib/c/lib9.c", + "/sys/src/lib/jehanne/lib9.c", "code.c", "init.c", "math.c", diff --git a/sys/src/cmd/kernel.json b/sys/src/cmd/kernel.json index 85afe4d..d936257 100644 --- a/sys/src/cmd/kernel.json +++ b/sys/src/cmd/kernel.json @@ -19,7 +19,7 @@ "/arch/$ARCH/lib/libauth.a", "/arch/$ARCH/lib/libbio.a", "/arch/$ARCH/lib/libip.a", - "/arch/$ARCH/lib/libc.a" + "/arch/$ARCH/lib/libjehanne.a" ], "Oflags": [ "-static" diff --git a/sys/src/cmd/rc/build.json b/sys/src/cmd/rc/build.json index 3d99741..d0cff4f 100644 --- a/sys/src/cmd/rc/build.json +++ b/sys/src/cmd/rc/build.json @@ -13,7 +13,7 @@ "Install": "/arch/$ARCH/cmd/", "Program": "rc", "SourceFiles": [ - "/sys/src/lib/c/lib9.c", + "/sys/src/lib/jehanne/lib9.c", "code.c", "exec.c", "getflags.c", diff --git a/sys/src/cmd/sys/build.json b/sys/src/cmd/sys/build.json index 2dfb038..5c5d847 100644 --- a/sys/src/cmd/sys/build.json +++ b/sys/src/cmd/sys/build.json @@ -6,7 +6,7 @@ "Install": "/arch/$ARCH/cmd/sys/", "Oflags": [ "-static", - "-lc" + "-ljehanne" ], "Projects": [ "call/" diff --git a/sys/src/kern/amd64/build.json b/sys/src/kern/amd64/build.json index 3072e0b..192406e 100644 --- a/sys/src/kern/amd64/build.json +++ b/sys/src/kern/amd64/build.json @@ -78,7 +78,7 @@ "Ramfiles": { "rofs": "/arch/$ARCH/cmd/disk/rofs" }, - "Systab": "/sys/src/lib/c/9syscall/sys.h" + "Systab": "/sys/src/lib/jehanne/9syscall/sys.h" }, "Program": "jehanne", "Install": "/arch/$ARCH/kern/", diff --git a/sys/src/kern/amd64/core.json b/sys/src/kern/amd64/core.json index 147b036..158789e 100644 --- a/sys/src/kern/amd64/core.json +++ b/sys/src/kern/amd64/core.json @@ -8,7 +8,7 @@ "-DKERNDATE=1433623937", "-c", "-I.", - "-I$JEHANNE/sys/src/lib/c", + "-I$JEHANNE/sys/src/lib/jehanne", "-mcmodel=kernel", "-O0", "-static", diff --git a/sys/src/kern/amd64/inith.json b/sys/src/kern/amd64/inith.json index eb5e657..cc5cd4e 100644 --- a/sys/src/kern/amd64/inith.json +++ b/sys/src/kern/amd64/inith.json @@ -15,7 +15,7 @@ "-mcmodel=small" ], "Libs": [ - "/arch/$ARCH/lib/libc.a" + "/arch/$ARCH/lib/libjehanne.a" ], "Post": [ "export TOOL=strip && $TOOLPREFIX$TOOL init", diff --git a/sys/src/kern/amd64/laptop.json b/sys/src/kern/amd64/laptop.json index de4dac5..c16218e 100644 --- a/sys/src/kern/amd64/laptop.json +++ b/sys/src/kern/amd64/laptop.json @@ -73,7 +73,7 @@ "Ramfiles": { "rofs": "/arch/$ARCH/cmd/disk/rofs" }, - "Systab": "/sys/src/lib/c/9syscall/sys.h" + "Systab": "/sys/src/lib/jehanne/9syscall/sys.h" }, "Post": [ "#strip $JEHANNE/arch/$ARCH/kern/jehanne" diff --git a/sys/src/kern/amd64/workhorse.json b/sys/src/kern/amd64/workhorse.json index 032a078..42693c3 100644 --- a/sys/src/kern/amd64/workhorse.json +++ b/sys/src/kern/amd64/workhorse.json @@ -92,7 +92,7 @@ "comconsole": "/arch/$ARCH/cmd/hmi/comconsole", "srv": "/arch/$ARCH/cmd/srv" }, - "Systab": "/sys/src/lib/c/9syscall/sys.h" + "Systab": "/sys/src/lib/jehanne/9syscall/sys.h" }, "Post": [ "OBJCOPY=objcopy; $TOOLPREFIX$OBJCOPY -I elf64-x86-64 -O elf32-i386 workhorse $JEHANNE/hacking/bin/workhorse.32bit", diff --git a/sys/src/kern/boot/build.json b/sys/src/kern/boot/build.json index 70bc5de..f42f270 100644 --- a/sys/src/kern/boot/build.json +++ b/sys/src/kern/boot/build.json @@ -45,7 +45,7 @@ "./libboot.a", "/arch/$ARCH/lib/libip.a", "/arch/$ARCH/lib/libauth.a", - "/arch/$ARCH/lib/libc.a" + "/arch/$ARCH/lib/libjehanne.a" ], "Oflags": [ "-static" diff --git a/sys/src/lib/c/.gitignore b/sys/src/lib/jehanne/.gitignore similarity index 100% rename from sys/src/lib/c/.gitignore rename to sys/src/lib/jehanne/.gitignore diff --git a/sys/src/lib/c/9sys/access.c b/sys/src/lib/jehanne/9sys/access.c similarity index 100% rename from sys/src/lib/c/9sys/access.c rename to sys/src/lib/jehanne/9sys/access.c diff --git a/sys/src/lib/c/9sys/announce.c b/sys/src/lib/jehanne/9sys/announce.c similarity index 100% rename from sys/src/lib/c/9sys/announce.c rename to sys/src/lib/jehanne/9sys/announce.c diff --git a/sys/src/lib/c/9sys/awakened.c b/sys/src/lib/jehanne/9sys/awakened.c similarity index 100% rename from sys/src/lib/c/9sys/awakened.c rename to sys/src/lib/jehanne/9sys/awakened.c diff --git a/sys/src/lib/c/9sys/chdir.c b/sys/src/lib/jehanne/9sys/chdir.c similarity index 100% rename from sys/src/lib/c/9sys/chdir.c rename to sys/src/lib/jehanne/9sys/chdir.c diff --git a/sys/src/lib/c/9sys/convD2M.c b/sys/src/lib/jehanne/9sys/convD2M.c similarity index 100% rename from sys/src/lib/c/9sys/convD2M.c rename to sys/src/lib/jehanne/9sys/convD2M.c diff --git a/sys/src/lib/c/9sys/convM2D.c b/sys/src/lib/jehanne/9sys/convM2D.c similarity index 100% rename from sys/src/lib/c/9sys/convM2D.c rename to sys/src/lib/jehanne/9sys/convM2D.c diff --git a/sys/src/lib/c/9sys/cputime.c b/sys/src/lib/jehanne/9sys/cputime.c similarity index 100% rename from sys/src/lib/c/9sys/cputime.c rename to sys/src/lib/jehanne/9sys/cputime.c diff --git a/sys/src/lib/c/9sys/ctime.c b/sys/src/lib/jehanne/9sys/ctime.c similarity index 100% rename from sys/src/lib/c/9sys/ctime.c rename to sys/src/lib/jehanne/9sys/ctime.c diff --git a/sys/src/lib/c/9sys/dial.c b/sys/src/lib/jehanne/9sys/dial.c similarity index 100% rename from sys/src/lib/c/9sys/dial.c rename to sys/src/lib/jehanne/9sys/dial.c diff --git a/sys/src/lib/c/9sys/dirfstat.c b/sys/src/lib/jehanne/9sys/dirfstat.c similarity index 100% rename from sys/src/lib/c/9sys/dirfstat.c rename to sys/src/lib/jehanne/9sys/dirfstat.c diff --git a/sys/src/lib/c/9sys/dirfwstat.c b/sys/src/lib/jehanne/9sys/dirfwstat.c similarity index 100% rename from sys/src/lib/c/9sys/dirfwstat.c rename to sys/src/lib/jehanne/9sys/dirfwstat.c diff --git a/sys/src/lib/c/9sys/dirmodefmt.c b/sys/src/lib/jehanne/9sys/dirmodefmt.c similarity index 100% rename from sys/src/lib/c/9sys/dirmodefmt.c rename to sys/src/lib/jehanne/9sys/dirmodefmt.c diff --git a/sys/src/lib/c/9sys/dirread.c b/sys/src/lib/jehanne/9sys/dirread.c similarity index 100% rename from sys/src/lib/c/9sys/dirread.c rename to sys/src/lib/jehanne/9sys/dirread.c diff --git a/sys/src/lib/c/9sys/dirstat.c b/sys/src/lib/jehanne/9sys/dirstat.c similarity index 100% rename from sys/src/lib/c/9sys/dirstat.c rename to sys/src/lib/jehanne/9sys/dirstat.c diff --git a/sys/src/lib/c/9sys/dirwstat.c b/sys/src/lib/jehanne/9sys/dirwstat.c similarity index 100% rename from sys/src/lib/c/9sys/dirwstat.c rename to sys/src/lib/jehanne/9sys/dirwstat.c diff --git a/sys/src/lib/c/9sys/dup.c b/sys/src/lib/jehanne/9sys/dup.c similarity index 100% rename from sys/src/lib/c/9sys/dup.c rename to sys/src/lib/jehanne/9sys/dup.c diff --git a/sys/src/lib/c/9sys/fork.c b/sys/src/lib/jehanne/9sys/fork.c similarity index 100% rename from sys/src/lib/c/9sys/fork.c rename to sys/src/lib/jehanne/9sys/fork.c diff --git a/sys/src/lib/c/9sys/getenv.c b/sys/src/lib/jehanne/9sys/getenv.c similarity index 100% rename from sys/src/lib/c/9sys/getenv.c rename to sys/src/lib/jehanne/9sys/getenv.c diff --git a/sys/src/lib/c/9sys/getmainpid.c b/sys/src/lib/jehanne/9sys/getmainpid.c similarity index 100% rename from sys/src/lib/c/9sys/getmainpid.c rename to sys/src/lib/jehanne/9sys/getmainpid.c diff --git a/sys/src/lib/c/9sys/getnetconninfo.c b/sys/src/lib/jehanne/9sys/getnetconninfo.c similarity index 100% rename from sys/src/lib/c/9sys/getnetconninfo.c rename to sys/src/lib/jehanne/9sys/getnetconninfo.c diff --git a/sys/src/lib/c/9sys/getpid.c b/sys/src/lib/jehanne/9sys/getpid.c similarity index 100% rename from sys/src/lib/c/9sys/getpid.c rename to sys/src/lib/jehanne/9sys/getpid.c diff --git a/sys/src/lib/c/9sys/getppid.c b/sys/src/lib/jehanne/9sys/getppid.c similarity index 100% rename from sys/src/lib/c/9sys/getppid.c rename to sys/src/lib/jehanne/9sys/getppid.c diff --git a/sys/src/lib/c/9sys/getwd.c b/sys/src/lib/jehanne/9sys/getwd.c similarity index 100% rename from sys/src/lib/c/9sys/getwd.c rename to sys/src/lib/jehanne/9sys/getwd.c diff --git a/sys/src/lib/c/9sys/iounit.c b/sys/src/lib/jehanne/9sys/iounit.c similarity index 100% rename from sys/src/lib/c/9sys/iounit.c rename to sys/src/lib/jehanne/9sys/iounit.c diff --git a/sys/src/lib/c/9sys/nsec.c b/sys/src/lib/jehanne/9sys/nsec.c similarity index 100% rename from sys/src/lib/c/9sys/nsec.c rename to sys/src/lib/jehanne/9sys/nsec.c diff --git a/sys/src/lib/c/9sys/nulldir.c b/sys/src/lib/jehanne/9sys/nulldir.c similarity index 100% rename from sys/src/lib/c/9sys/nulldir.c rename to sys/src/lib/jehanne/9sys/nulldir.c diff --git a/sys/src/lib/c/9sys/ocreate.c b/sys/src/lib/jehanne/9sys/ocreate.c similarity index 93% rename from sys/src/lib/c/9sys/ocreate.c rename to sys/src/lib/jehanne/9sys/ocreate.c index e153827..c13ebd3 100644 --- a/sys/src/lib/c/9sys/ocreate.c +++ b/sys/src/lib/jehanne/9sys/ocreate.c @@ -19,8 +19,8 @@ #include #include -/* osys_create works like the Plan 9 create(2) syscall, but with different races. - * In Plan 9 tjere os a race due to the different behaviour between the +/* ocreate works like the Plan 9 create(2) syscall, but with different races. + * In Plan 9 there is a race due to the different behaviour between the * create syscall and the Tcreate message in 9P2000 when the file already exists: * see https://github.com/brho/plan9/blob/master/sys/src/9/port/chan.c#L1564-L1603 * for details. diff --git a/sys/src/lib/c/9sys/pexec.c b/sys/src/lib/jehanne/9sys/pexec.c similarity index 100% rename from sys/src/lib/c/9sys/pexec.c rename to sys/src/lib/jehanne/9sys/pexec.c diff --git a/sys/src/lib/c/9sys/pipe.c b/sys/src/lib/jehanne/9sys/pipe.c similarity index 100% rename from sys/src/lib/c/9sys/pipe.c rename to sys/src/lib/jehanne/9sys/pipe.c diff --git a/sys/src/lib/c/9sys/postnote.c b/sys/src/lib/jehanne/9sys/postnote.c similarity index 100% rename from sys/src/lib/c/9sys/postnote.c rename to sys/src/lib/jehanne/9sys/postnote.c diff --git a/sys/src/lib/c/9sys/privalloc.c b/sys/src/lib/jehanne/9sys/privalloc.c similarity index 100% rename from sys/src/lib/c/9sys/privalloc.c rename to sys/src/lib/jehanne/9sys/privalloc.c diff --git a/sys/src/lib/c/9sys/pushssl.c b/sys/src/lib/jehanne/9sys/pushssl.c similarity index 100% rename from sys/src/lib/c/9sys/pushssl.c rename to sys/src/lib/jehanne/9sys/pushssl.c diff --git a/sys/src/lib/c/9sys/putenv.c b/sys/src/lib/jehanne/9sys/putenv.c similarity index 100% rename from sys/src/lib/c/9sys/putenv.c rename to sys/src/lib/jehanne/9sys/putenv.c diff --git a/sys/src/lib/c/9sys/qlock.c b/sys/src/lib/jehanne/9sys/qlock.c similarity index 100% rename from sys/src/lib/c/9sys/qlock.c rename to sys/src/lib/jehanne/9sys/qlock.c diff --git a/sys/src/lib/c/9sys/read.c b/sys/src/lib/jehanne/9sys/read.c similarity index 92% rename from sys/src/lib/c/9sys/read.c rename to sys/src/lib/jehanne/9sys/read.c index ff70b11..cf84a78 100644 --- a/sys/src/lib/c/9sys/read.c +++ b/sys/src/lib/jehanne/9sys/read.c @@ -1,7 +1,7 @@ /* * This file is part of Jehanne. * - * Copyright (C) 2015-2019 Giacomo Tesio + * Copyright (C) 2015-2020 Giacomo Tesio * * Jehanne is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ #include #include -int +long jehanne_read(int fd, void* buf, int nbytes) { return sys_pread(fd, buf, nbytes, ~0LL); diff --git a/sys/src/lib/c/9sys/rerrstr.c b/sys/src/lib/jehanne/9sys/rerrstr.c similarity index 100% rename from sys/src/lib/c/9sys/rerrstr.c rename to sys/src/lib/jehanne/9sys/rerrstr.c diff --git a/sys/src/lib/c/9sys/segattach.c b/sys/src/lib/jehanne/9sys/segattach.c similarity index 100% rename from sys/src/lib/c/9sys/segattach.c rename to sys/src/lib/jehanne/9sys/segattach.c diff --git a/sys/src/lib/c/9sys/segbrk.c b/sys/src/lib/jehanne/9sys/segbrk.c similarity index 100% rename from sys/src/lib/c/9sys/segbrk.c rename to sys/src/lib/jehanne/9sys/segbrk.c diff --git a/sys/src/lib/c/9sys/setnetmtpt.c b/sys/src/lib/jehanne/9sys/setnetmtpt.c similarity index 100% rename from sys/src/lib/c/9sys/setnetmtpt.c rename to sys/src/lib/jehanne/9sys/setnetmtpt.c diff --git a/sys/src/lib/c/9sys/sleep.c b/sys/src/lib/jehanne/9sys/sleep.c similarity index 100% rename from sys/src/lib/c/9sys/sleep.c rename to sys/src/lib/jehanne/9sys/sleep.c diff --git a/sys/src/lib/c/9sys/stat.c b/sys/src/lib/jehanne/9sys/stat.c similarity index 100% rename from sys/src/lib/c/9sys/stat.c rename to sys/src/lib/jehanne/9sys/stat.c diff --git a/sys/src/lib/c/9sys/sysfatal.c b/sys/src/lib/jehanne/9sys/sysfatal.c similarity index 100% rename from sys/src/lib/c/9sys/sysfatal.c rename to sys/src/lib/jehanne/9sys/sysfatal.c diff --git a/sys/src/lib/c/9sys/syslog.c b/sys/src/lib/jehanne/9sys/syslog.c similarity index 100% rename from sys/src/lib/c/9sys/syslog.c rename to sys/src/lib/jehanne/9sys/syslog.c diff --git a/sys/src/lib/c/9sys/sysname.c b/sys/src/lib/jehanne/9sys/sysname.c similarity index 100% rename from sys/src/lib/c/9sys/sysname.c rename to sys/src/lib/jehanne/9sys/sysname.c diff --git a/sys/src/lib/c/9sys/time.c b/sys/src/lib/jehanne/9sys/time.c similarity index 100% rename from sys/src/lib/c/9sys/time.c rename to sys/src/lib/jehanne/9sys/time.c diff --git a/sys/src/lib/c/9sys/times.c b/sys/src/lib/jehanne/9sys/times.c similarity index 100% rename from sys/src/lib/c/9sys/times.c rename to sys/src/lib/jehanne/9sys/times.c diff --git a/sys/src/lib/c/9sys/tm2sec.c b/sys/src/lib/jehanne/9sys/tm2sec.c similarity index 100% rename from sys/src/lib/c/9sys/tm2sec.c rename to sys/src/lib/jehanne/9sys/tm2sec.c diff --git a/sys/src/lib/c/9sys/truerand.c b/sys/src/lib/jehanne/9sys/truerand.c similarity index 100% rename from sys/src/lib/c/9sys/truerand.c rename to sys/src/lib/jehanne/9sys/truerand.c diff --git a/sys/src/lib/c/9sys/tsemacquire.c b/sys/src/lib/jehanne/9sys/tsemacquire.c similarity index 100% rename from sys/src/lib/c/9sys/tsemacquire.c rename to sys/src/lib/jehanne/9sys/tsemacquire.c diff --git a/sys/src/lib/c/9sys/wait.c b/sys/src/lib/jehanne/9sys/wait.c similarity index 100% rename from sys/src/lib/c/9sys/wait.c rename to sys/src/lib/jehanne/9sys/wait.c diff --git a/sys/src/lib/c/9sys/waitpid.c b/sys/src/lib/jehanne/9sys/waitpid.c similarity index 100% rename from sys/src/lib/c/9sys/waitpid.c rename to sys/src/lib/jehanne/9sys/waitpid.c diff --git a/sys/src/lib/c/9sys/werrstr.c b/sys/src/lib/jehanne/9sys/werrstr.c similarity index 100% rename from sys/src/lib/c/9sys/werrstr.c rename to sys/src/lib/jehanne/9sys/werrstr.c diff --git a/sys/src/lib/c/9sys/write.c b/sys/src/lib/jehanne/9sys/write.c similarity index 99% rename from sys/src/lib/c/9sys/write.c rename to sys/src/lib/jehanne/9sys/write.c index 2611695..f0479b5 100644 --- a/sys/src/lib/c/9sys/write.c +++ b/sys/src/lib/jehanne/9sys/write.c @@ -18,7 +18,7 @@ #include #include -int +long jehanne_write(int fd, const void* buf, int nbytes) { return sys_pwrite(fd, buf, nbytes, ~0LL); diff --git a/sys/src/lib/c/amd64/argv0.c b/sys/src/lib/jehanne/amd64/argv0.c similarity index 100% rename from sys/src/lib/c/amd64/argv0.c rename to sys/src/lib/jehanne/amd64/argv0.c diff --git a/sys/src/lib/c/amd64/atom.s b/sys/src/lib/jehanne/amd64/atom.s similarity index 100% rename from sys/src/lib/c/amd64/atom.s rename to sys/src/lib/jehanne/amd64/atom.s diff --git a/sys/src/lib/c/amd64/crt0.s b/sys/src/lib/jehanne/amd64/crt0.s similarity index 100% rename from sys/src/lib/c/amd64/crt0.s rename to sys/src/lib/jehanne/amd64/crt0.s diff --git a/sys/src/lib/c/amd64/crti.s b/sys/src/lib/jehanne/amd64/crti.s similarity index 100% rename from sys/src/lib/c/amd64/crti.s rename to sys/src/lib/jehanne/amd64/crti.s diff --git a/sys/src/lib/c/amd64/crtn.s b/sys/src/lib/jehanne/amd64/crtn.s similarity index 100% rename from sys/src/lib/c/amd64/crtn.s rename to sys/src/lib/jehanne/amd64/crtn.s diff --git a/sys/src/lib/c/amd64/cycles.c b/sys/src/lib/jehanne/amd64/cycles.c similarity index 100% rename from sys/src/lib/c/amd64/cycles.c rename to sys/src/lib/jehanne/amd64/cycles.c diff --git a/sys/src/lib/c/amd64/getfcr.s b/sys/src/lib/jehanne/amd64/getfcr.s similarity index 100% rename from sys/src/lib/c/amd64/getfcr.s rename to sys/src/lib/jehanne/amd64/getfcr.s diff --git a/sys/src/lib/c/amd64/initlib.c b/sys/src/lib/jehanne/amd64/initlib.c similarity index 100% rename from sys/src/lib/c/amd64/initlib.c rename to sys/src/lib/jehanne/amd64/initlib.c diff --git a/sys/src/lib/c/amd64/notejmp.c b/sys/src/lib/jehanne/amd64/notejmp.c similarity index 100% rename from sys/src/lib/c/amd64/notejmp.c rename to sys/src/lib/jehanne/amd64/notejmp.c diff --git a/sys/src/lib/c/amd64/rdpmc.c b/sys/src/lib/jehanne/amd64/rdpmc.c similarity index 100% rename from sys/src/lib/c/amd64/rdpmc.c rename to sys/src/lib/jehanne/amd64/rdpmc.c diff --git a/sys/src/lib/c/amd64/setjmp.s b/sys/src/lib/jehanne/amd64/setjmp.s similarity index 100% rename from sys/src/lib/c/amd64/setjmp.s rename to sys/src/lib/jehanne/amd64/setjmp.s diff --git a/sys/src/lib/c/amd64/sqrt.s b/sys/src/lib/jehanne/amd64/sqrt.s similarity index 100% rename from sys/src/lib/c/amd64/sqrt.s rename to sys/src/lib/jehanne/amd64/sqrt.s diff --git a/sys/src/lib/c/amd64/stackchk.c b/sys/src/lib/jehanne/amd64/stackchk.c similarity index 100% rename from sys/src/lib/c/amd64/stackchk.c rename to sys/src/lib/jehanne/amd64/stackchk.c diff --git a/sys/src/lib/c/amd64/tas.s b/sys/src/lib/jehanne/amd64/tas.s similarity index 100% rename from sys/src/lib/c/amd64/tas.s rename to sys/src/lib/jehanne/amd64/tas.s diff --git a/sys/src/lib/c/apw/abort.c b/sys/src/lib/jehanne/apw/abort.c similarity index 100% rename from sys/src/lib/c/apw/abort.c rename to sys/src/lib/jehanne/apw/abort.c diff --git a/sys/src/lib/c/apw/div.c b/sys/src/lib/jehanne/apw/div.c similarity index 100% rename from sys/src/lib/c/apw/div.c rename to sys/src/lib/jehanne/apw/div.c diff --git a/sys/src/lib/c/apw/eprintf.c b/sys/src/lib/jehanne/apw/eprintf.c similarity index 100% rename from sys/src/lib/c/apw/eprintf.c rename to sys/src/lib/jehanne/apw/eprintf.c diff --git a/sys/src/lib/c/apw/exit.c b/sys/src/lib/jehanne/apw/exit.c similarity index 100% rename from sys/src/lib/c/apw/exit.c rename to sys/src/lib/jehanne/apw/exit.c diff --git a/sys/src/lib/c/apw/system.c b/sys/src/lib/jehanne/apw/system.c similarity index 100% rename from sys/src/lib/c/apw/system.c rename to sys/src/lib/jehanne/apw/system.c diff --git a/sys/src/lib/c/build.json b/sys/src/lib/jehanne/build.json similarity index 98% rename from sys/src/lib/c/build.json rename to sys/src/lib/jehanne/build.json index 9a92f91..98d9267 100644 --- a/sys/src/lib/c/build.json +++ b/sys/src/lib/jehanne/build.json @@ -15,7 +15,7 @@ "$ARCH/crtn.s" ] }, - "Libc": { + "LibJehanne": { "Cflags": [ "-fasm" ], @@ -23,10 +23,10 @@ "../lib.json" ], "Install": "/arch/$ARCH/lib/", - "Library": "libc.a", + "Library": "libjehanne.a", "Pre": [ "usyscalls header $JEHANNE/sys/src/sysconf.json > $JEHANNE/arch/amd64/include/syscalls.h", - "usyscalls code $JEHANNE/sys/src/sysconf.json > $JEHANNE/sys/src/lib/c/amd64/syscalls.c" + "usyscalls code $JEHANNE/sys/src/sysconf.json > $JEHANNE/sys/src/lib/jehanne/amd64/syscalls.c" ], "Post": [ "TOOL=ar; $TOOLPREFIX$TOOL rcs $JEHANNE/arch/$ARCH/lib/libssp.a", diff --git a/sys/src/lib/c/fmt/dofmt.c b/sys/src/lib/jehanne/fmt/dofmt.c similarity index 100% rename from sys/src/lib/c/fmt/dofmt.c rename to sys/src/lib/jehanne/fmt/dofmt.c diff --git a/sys/src/lib/c/fmt/dorfmt.c b/sys/src/lib/jehanne/fmt/dorfmt.c similarity index 100% rename from sys/src/lib/c/fmt/dorfmt.c rename to sys/src/lib/jehanne/fmt/dorfmt.c diff --git a/sys/src/lib/c/fmt/errfmt.c b/sys/src/lib/jehanne/fmt/errfmt.c similarity index 100% rename from sys/src/lib/c/fmt/errfmt.c rename to sys/src/lib/jehanne/fmt/errfmt.c diff --git a/sys/src/lib/c/fmt/fltfmt.c b/sys/src/lib/jehanne/fmt/fltfmt.c similarity index 100% rename from sys/src/lib/c/fmt/fltfmt.c rename to sys/src/lib/jehanne/fmt/fltfmt.c diff --git a/sys/src/lib/c/fmt/fmt.c b/sys/src/lib/jehanne/fmt/fmt.c similarity index 100% rename from sys/src/lib/c/fmt/fmt.c rename to sys/src/lib/jehanne/fmt/fmt.c diff --git a/sys/src/lib/c/fmt/fmtdef.h b/sys/src/lib/jehanne/fmt/fmtdef.h similarity index 100% rename from sys/src/lib/c/fmt/fmtdef.h rename to sys/src/lib/jehanne/fmt/fmtdef.h diff --git a/sys/src/lib/c/fmt/fmtfd.c b/sys/src/lib/jehanne/fmt/fmtfd.c similarity index 100% rename from sys/src/lib/c/fmt/fmtfd.c rename to sys/src/lib/jehanne/fmt/fmtfd.c diff --git a/sys/src/lib/c/fmt/fmtlock.c b/sys/src/lib/jehanne/fmt/fmtlock.c similarity index 100% rename from sys/src/lib/c/fmt/fmtlock.c rename to sys/src/lib/jehanne/fmt/fmtlock.c diff --git a/sys/src/lib/c/fmt/fmtprint.c b/sys/src/lib/jehanne/fmt/fmtprint.c similarity index 100% rename from sys/src/lib/c/fmt/fmtprint.c rename to sys/src/lib/jehanne/fmt/fmtprint.c diff --git a/sys/src/lib/c/fmt/fmtquote.c b/sys/src/lib/jehanne/fmt/fmtquote.c similarity index 100% rename from sys/src/lib/c/fmt/fmtquote.c rename to sys/src/lib/jehanne/fmt/fmtquote.c diff --git a/sys/src/lib/c/fmt/fmtrune.c b/sys/src/lib/jehanne/fmt/fmtrune.c similarity index 100% rename from sys/src/lib/c/fmt/fmtrune.c rename to sys/src/lib/jehanne/fmt/fmtrune.c diff --git a/sys/src/lib/c/fmt/fmtstr.c b/sys/src/lib/jehanne/fmt/fmtstr.c similarity index 100% rename from sys/src/lib/c/fmt/fmtstr.c rename to sys/src/lib/jehanne/fmt/fmtstr.c diff --git a/sys/src/lib/c/fmt/fmtvprint.c b/sys/src/lib/jehanne/fmt/fmtvprint.c similarity index 100% rename from sys/src/lib/c/fmt/fmtvprint.c rename to sys/src/lib/jehanne/fmt/fmtvprint.c diff --git a/sys/src/lib/c/fmt/fprint.c b/sys/src/lib/jehanne/fmt/fprint.c similarity index 100% rename from sys/src/lib/c/fmt/fprint.c rename to sys/src/lib/jehanne/fmt/fprint.c diff --git a/sys/src/lib/c/fmt/print.c b/sys/src/lib/jehanne/fmt/print.c similarity index 100% rename from sys/src/lib/c/fmt/print.c rename to sys/src/lib/jehanne/fmt/print.c diff --git a/sys/src/lib/c/fmt/runefmtstr.c b/sys/src/lib/jehanne/fmt/runefmtstr.c similarity index 100% rename from sys/src/lib/c/fmt/runefmtstr.c rename to sys/src/lib/jehanne/fmt/runefmtstr.c diff --git a/sys/src/lib/c/fmt/runeseprint.c b/sys/src/lib/jehanne/fmt/runeseprint.c similarity index 100% rename from sys/src/lib/c/fmt/runeseprint.c rename to sys/src/lib/jehanne/fmt/runeseprint.c diff --git a/sys/src/lib/c/fmt/runesmprint.c b/sys/src/lib/jehanne/fmt/runesmprint.c similarity index 100% rename from sys/src/lib/c/fmt/runesmprint.c rename to sys/src/lib/jehanne/fmt/runesmprint.c diff --git a/sys/src/lib/c/fmt/runesnprint.c b/sys/src/lib/jehanne/fmt/runesnprint.c similarity index 100% rename from sys/src/lib/c/fmt/runesnprint.c rename to sys/src/lib/jehanne/fmt/runesnprint.c diff --git a/sys/src/lib/c/fmt/runesprint.c b/sys/src/lib/jehanne/fmt/runesprint.c similarity index 100% rename from sys/src/lib/c/fmt/runesprint.c rename to sys/src/lib/jehanne/fmt/runesprint.c diff --git a/sys/src/lib/c/fmt/runevseprint.c b/sys/src/lib/jehanne/fmt/runevseprint.c similarity index 100% rename from sys/src/lib/c/fmt/runevseprint.c rename to sys/src/lib/jehanne/fmt/runevseprint.c diff --git a/sys/src/lib/c/fmt/runevsmprint.c b/sys/src/lib/jehanne/fmt/runevsmprint.c similarity index 100% rename from sys/src/lib/c/fmt/runevsmprint.c rename to sys/src/lib/jehanne/fmt/runevsmprint.c diff --git a/sys/src/lib/c/fmt/runevsnprint.c b/sys/src/lib/jehanne/fmt/runevsnprint.c similarity index 100% rename from sys/src/lib/c/fmt/runevsnprint.c rename to sys/src/lib/jehanne/fmt/runevsnprint.c diff --git a/sys/src/lib/c/fmt/seprint.c b/sys/src/lib/jehanne/fmt/seprint.c similarity index 100% rename from sys/src/lib/c/fmt/seprint.c rename to sys/src/lib/jehanne/fmt/seprint.c diff --git a/sys/src/lib/c/fmt/smprint.c b/sys/src/lib/jehanne/fmt/smprint.c similarity index 100% rename from sys/src/lib/c/fmt/smprint.c rename to sys/src/lib/jehanne/fmt/smprint.c diff --git a/sys/src/lib/c/fmt/snprint.c b/sys/src/lib/jehanne/fmt/snprint.c similarity index 100% rename from sys/src/lib/c/fmt/snprint.c rename to sys/src/lib/jehanne/fmt/snprint.c diff --git a/sys/src/lib/c/fmt/sprint.c b/sys/src/lib/jehanne/fmt/sprint.c similarity index 100% rename from sys/src/lib/c/fmt/sprint.c rename to sys/src/lib/jehanne/fmt/sprint.c diff --git a/sys/src/lib/c/fmt/vfprint.c b/sys/src/lib/jehanne/fmt/vfprint.c similarity index 100% rename from sys/src/lib/c/fmt/vfprint.c rename to sys/src/lib/jehanne/fmt/vfprint.c diff --git a/sys/src/lib/c/fmt/vseprint.c b/sys/src/lib/jehanne/fmt/vseprint.c similarity index 100% rename from sys/src/lib/c/fmt/vseprint.c rename to sys/src/lib/jehanne/fmt/vseprint.c diff --git a/sys/src/lib/c/fmt/vsmprint.c b/sys/src/lib/jehanne/fmt/vsmprint.c similarity index 100% rename from sys/src/lib/c/fmt/vsmprint.c rename to sys/src/lib/jehanne/fmt/vsmprint.c diff --git a/sys/src/lib/c/fmt/vsnprint.c b/sys/src/lib/jehanne/fmt/vsnprint.c similarity index 100% rename from sys/src/lib/c/fmt/vsnprint.c rename to sys/src/lib/jehanne/fmt/vsnprint.c diff --git a/sys/src/lib/c/klibc.json b/sys/src/lib/jehanne/klibc.json similarity index 98% rename from sys/src/lib/c/klibc.json rename to sys/src/lib/jehanne/klibc.json index 5775b35..35a6853 100644 --- a/sys/src/lib/c/klibc.json +++ b/sys/src/lib/jehanne/klibc.json @@ -11,7 +11,7 @@ "Library": "klibc.a", "Pre": [ "usyscalls header $JEHANNE/sys/src/sysconf.json > $JEHANNE/arch/amd64/include/syscalls.h", - "usyscalls code $JEHANNE/sys/src/sysconf.json > $JEHANNE/sys/src/lib/c/amd64/syscalls.c" + "usyscalls code $JEHANNE/sys/src/sysconf.json > $JEHANNE/sys/src/lib/jehanne/amd64/syscalls.c" ], "SourceFiles": [ "9sys/convD2M.c", diff --git a/sys/src/lib/c/lib9.c b/sys/src/lib/jehanne/lib9.c similarity index 100% rename from sys/src/lib/c/lib9.c rename to sys/src/lib/jehanne/lib9.c diff --git a/sys/src/lib/c/port/_assert.c b/sys/src/lib/jehanne/port/_assert.c similarity index 100% rename from sys/src/lib/c/port/_assert.c rename to sys/src/lib/jehanne/port/_assert.c diff --git a/sys/src/lib/c/port/abs.c b/sys/src/lib/jehanne/port/abs.c similarity index 100% rename from sys/src/lib/c/port/abs.c rename to sys/src/lib/jehanne/port/abs.c diff --git a/sys/src/lib/c/port/asin.c b/sys/src/lib/jehanne/port/asin.c similarity index 100% rename from sys/src/lib/c/port/asin.c rename to sys/src/lib/jehanne/port/asin.c diff --git a/sys/src/lib/c/port/atan.c b/sys/src/lib/jehanne/port/atan.c similarity index 100% rename from sys/src/lib/c/port/atan.c rename to sys/src/lib/jehanne/port/atan.c diff --git a/sys/src/lib/c/port/atan2.c b/sys/src/lib/jehanne/port/atan2.c similarity index 100% rename from sys/src/lib/c/port/atan2.c rename to sys/src/lib/jehanne/port/atan2.c diff --git a/sys/src/lib/c/port/atexit.c b/sys/src/lib/jehanne/port/atexit.c similarity index 100% rename from sys/src/lib/c/port/atexit.c rename to sys/src/lib/jehanne/port/atexit.c diff --git a/sys/src/lib/c/port/atnotify.c b/sys/src/lib/jehanne/port/atnotify.c similarity index 100% rename from sys/src/lib/c/port/atnotify.c rename to sys/src/lib/jehanne/port/atnotify.c diff --git a/sys/src/lib/c/port/atof.c b/sys/src/lib/jehanne/port/atof.c similarity index 100% rename from sys/src/lib/c/port/atof.c rename to sys/src/lib/jehanne/port/atof.c diff --git a/sys/src/lib/c/port/atol.c b/sys/src/lib/jehanne/port/atol.c similarity index 100% rename from sys/src/lib/c/port/atol.c rename to sys/src/lib/jehanne/port/atol.c diff --git a/sys/src/lib/c/port/atoll.c b/sys/src/lib/jehanne/port/atoll.c similarity index 100% rename from sys/src/lib/c/port/atoll.c rename to sys/src/lib/jehanne/port/atoll.c diff --git a/sys/src/lib/c/port/bsearch.c b/sys/src/lib/jehanne/port/bsearch.c similarity index 100% rename from sys/src/lib/c/port/bsearch.c rename to sys/src/lib/jehanne/port/bsearch.c diff --git a/sys/src/lib/c/port/charstod.c b/sys/src/lib/jehanne/port/charstod.c similarity index 100% rename from sys/src/lib/c/port/charstod.c rename to sys/src/lib/jehanne/port/charstod.c diff --git a/sys/src/lib/c/port/cistrcmp.c b/sys/src/lib/jehanne/port/cistrcmp.c similarity index 100% rename from sys/src/lib/c/port/cistrcmp.c rename to sys/src/lib/jehanne/port/cistrcmp.c diff --git a/sys/src/lib/c/port/cistrncmp.c b/sys/src/lib/jehanne/port/cistrncmp.c similarity index 100% rename from sys/src/lib/c/port/cistrncmp.c rename to sys/src/lib/jehanne/port/cistrncmp.c diff --git a/sys/src/lib/c/port/cistrstr.c b/sys/src/lib/jehanne/port/cistrstr.c similarity index 100% rename from sys/src/lib/c/port/cistrstr.c rename to sys/src/lib/jehanne/port/cistrstr.c diff --git a/sys/src/lib/c/port/cleanname.c b/sys/src/lib/jehanne/port/cleanname.c similarity index 100% rename from sys/src/lib/c/port/cleanname.c rename to sys/src/lib/jehanne/port/cleanname.c diff --git a/sys/src/lib/c/port/crypt.c b/sys/src/lib/jehanne/port/crypt.c similarity index 100% rename from sys/src/lib/c/port/crypt.c rename to sys/src/lib/jehanne/port/crypt.c diff --git a/sys/src/lib/c/port/ctype.c b/sys/src/lib/jehanne/port/ctype.c similarity index 100% rename from sys/src/lib/c/port/ctype.c rename to sys/src/lib/jehanne/port/ctype.c diff --git a/sys/src/lib/c/port/encodefmt.c b/sys/src/lib/jehanne/port/encodefmt.c similarity index 100% rename from sys/src/lib/c/port/encodefmt.c rename to sys/src/lib/jehanne/port/encodefmt.c diff --git a/sys/src/lib/c/port/execl.c b/sys/src/lib/jehanne/port/execl.c similarity index 100% rename from sys/src/lib/c/port/execl.c rename to sys/src/lib/jehanne/port/execl.c diff --git a/sys/src/lib/c/port/exits.c b/sys/src/lib/jehanne/port/exits.c similarity index 100% rename from sys/src/lib/c/port/exits.c rename to sys/src/lib/jehanne/port/exits.c diff --git a/sys/src/lib/c/port/exp.c b/sys/src/lib/jehanne/port/exp.c similarity index 100% rename from sys/src/lib/c/port/exp.c rename to sys/src/lib/jehanne/port/exp.c diff --git a/sys/src/lib/c/port/fabs.c b/sys/src/lib/jehanne/port/fabs.c similarity index 100% rename from sys/src/lib/c/port/fabs.c rename to sys/src/lib/jehanne/port/fabs.c diff --git a/sys/src/lib/c/port/floor.c b/sys/src/lib/jehanne/port/floor.c similarity index 100% rename from sys/src/lib/c/port/floor.c rename to sys/src/lib/jehanne/port/floor.c diff --git a/sys/src/lib/c/port/fmod.c b/sys/src/lib/jehanne/port/fmod.c similarity index 100% rename from sys/src/lib/c/port/fmod.c rename to sys/src/lib/jehanne/port/fmod.c diff --git a/sys/src/lib/c/port/frand.c b/sys/src/lib/jehanne/port/frand.c similarity index 100% rename from sys/src/lib/c/port/frand.c rename to sys/src/lib/jehanne/port/frand.c diff --git a/sys/src/lib/c/port/frexp.c b/sys/src/lib/jehanne/port/frexp.c similarity index 100% rename from sys/src/lib/c/port/frexp.c rename to sys/src/lib/jehanne/port/frexp.c diff --git a/sys/src/lib/c/port/getcallerpc.c b/sys/src/lib/jehanne/port/getcallerpc.c similarity index 100% rename from sys/src/lib/c/port/getcallerpc.c rename to sys/src/lib/jehanne/port/getcallerpc.c diff --git a/sys/src/lib/c/port/getfields.c b/sys/src/lib/jehanne/port/getfields.c similarity index 100% rename from sys/src/lib/c/port/getfields.c rename to sys/src/lib/jehanne/port/getfields.c diff --git a/sys/src/lib/c/port/getuser.c b/sys/src/lib/jehanne/port/getuser.c similarity index 100% rename from sys/src/lib/c/port/getuser.c rename to sys/src/lib/jehanne/port/getuser.c diff --git a/sys/src/lib/c/port/hangup.c b/sys/src/lib/jehanne/port/hangup.c similarity index 100% rename from sys/src/lib/c/port/hangup.c rename to sys/src/lib/jehanne/port/hangup.c diff --git a/sys/src/lib/c/port/hypot.c b/sys/src/lib/jehanne/port/hypot.c similarity index 100% rename from sys/src/lib/c/port/hypot.c rename to sys/src/lib/jehanne/port/hypot.c diff --git a/sys/src/lib/c/port/lnrand.c b/sys/src/lib/jehanne/port/lnrand.c similarity index 100% rename from sys/src/lib/c/port/lnrand.c rename to sys/src/lib/jehanne/port/lnrand.c diff --git a/sys/src/lib/c/port/lock.c b/sys/src/lib/jehanne/port/lock.c similarity index 100% rename from sys/src/lib/c/port/lock.c rename to sys/src/lib/jehanne/port/lock.c diff --git a/sys/src/lib/c/port/log.c b/sys/src/lib/jehanne/port/log.c similarity index 100% rename from sys/src/lib/c/port/log.c rename to sys/src/lib/jehanne/port/log.c diff --git a/sys/src/lib/c/port/lrand.c b/sys/src/lib/jehanne/port/lrand.c similarity index 100% rename from sys/src/lib/c/port/lrand.c rename to sys/src/lib/jehanne/port/lrand.c diff --git a/sys/src/lib/c/port/malloc.c b/sys/src/lib/jehanne/port/malloc.c similarity index 100% rename from sys/src/lib/c/port/malloc.c rename to sys/src/lib/jehanne/port/malloc.c diff --git a/sys/src/lib/c/port/memccpy.c b/sys/src/lib/jehanne/port/memccpy.c similarity index 100% rename from sys/src/lib/c/port/memccpy.c rename to sys/src/lib/jehanne/port/memccpy.c diff --git a/sys/src/lib/c/port/memchr.c b/sys/src/lib/jehanne/port/memchr.c similarity index 100% rename from sys/src/lib/c/port/memchr.c rename to sys/src/lib/jehanne/port/memchr.c diff --git a/sys/src/lib/c/port/memcmp.c b/sys/src/lib/jehanne/port/memcmp.c similarity index 100% rename from sys/src/lib/c/port/memcmp.c rename to sys/src/lib/jehanne/port/memcmp.c diff --git a/sys/src/lib/c/port/memmove.c b/sys/src/lib/jehanne/port/memmove.c similarity index 100% rename from sys/src/lib/c/port/memmove.c rename to sys/src/lib/jehanne/port/memmove.c diff --git a/sys/src/lib/c/port/memset.c b/sys/src/lib/jehanne/port/memset.c similarity index 100% rename from sys/src/lib/c/port/memset.c rename to sys/src/lib/jehanne/port/memset.c diff --git a/sys/src/lib/c/port/mktemp.c b/sys/src/lib/jehanne/port/mktemp.c similarity index 100% rename from sys/src/lib/c/port/mktemp.c rename to sys/src/lib/jehanne/port/mktemp.c diff --git a/sys/src/lib/c/port/muldiv.c b/sys/src/lib/jehanne/port/muldiv.c similarity index 100% rename from sys/src/lib/c/port/muldiv.c rename to sys/src/lib/jehanne/port/muldiv.c diff --git a/sys/src/lib/c/port/nan.c b/sys/src/lib/jehanne/port/nan.c similarity index 100% rename from sys/src/lib/c/port/nan.c rename to sys/src/lib/jehanne/port/nan.c diff --git a/sys/src/lib/c/port/needsrcquote.c b/sys/src/lib/jehanne/port/needsrcquote.c similarity index 100% rename from sys/src/lib/c/port/needsrcquote.c rename to sys/src/lib/jehanne/port/needsrcquote.c diff --git a/sys/src/lib/c/port/netmkaddr.c b/sys/src/lib/jehanne/port/netmkaddr.c similarity index 100% rename from sys/src/lib/c/port/netmkaddr.c rename to sys/src/lib/jehanne/port/netmkaddr.c diff --git a/sys/src/lib/c/port/nrand.c b/sys/src/lib/jehanne/port/nrand.c similarity index 100% rename from sys/src/lib/c/port/nrand.c rename to sys/src/lib/jehanne/port/nrand.c diff --git a/sys/src/lib/c/port/ntruerand.c b/sys/src/lib/jehanne/port/ntruerand.c similarity index 100% rename from sys/src/lib/c/port/ntruerand.c rename to sys/src/lib/jehanne/port/ntruerand.c diff --git a/sys/src/lib/c/port/perror.c b/sys/src/lib/jehanne/port/perror.c similarity index 100% rename from sys/src/lib/c/port/perror.c rename to sys/src/lib/jehanne/port/perror.c diff --git a/sys/src/lib/c/port/pool.c b/sys/src/lib/jehanne/port/pool.c similarity index 100% rename from sys/src/lib/c/port/pool.c rename to sys/src/lib/jehanne/port/pool.c diff --git a/sys/src/lib/c/port/pow.c b/sys/src/lib/jehanne/port/pow.c similarity index 100% rename from sys/src/lib/c/port/pow.c rename to sys/src/lib/jehanne/port/pow.c diff --git a/sys/src/lib/c/port/pow10.c b/sys/src/lib/jehanne/port/pow10.c similarity index 100% rename from sys/src/lib/c/port/pow10.c rename to sys/src/lib/jehanne/port/pow10.c diff --git a/sys/src/lib/c/port/qsort.c b/sys/src/lib/jehanne/port/qsort.c similarity index 100% rename from sys/src/lib/c/port/qsort.c rename to sys/src/lib/jehanne/port/qsort.c diff --git a/sys/src/lib/c/port/quote.c b/sys/src/lib/jehanne/port/quote.c similarity index 100% rename from sys/src/lib/c/port/quote.c rename to sys/src/lib/jehanne/port/quote.c diff --git a/sys/src/lib/c/port/rand.c b/sys/src/lib/jehanne/port/rand.c similarity index 100% rename from sys/src/lib/c/port/rand.c rename to sys/src/lib/jehanne/port/rand.c diff --git a/sys/src/lib/c/port/readn.c b/sys/src/lib/jehanne/port/readn.c similarity index 100% rename from sys/src/lib/c/port/readn.c rename to sys/src/lib/jehanne/port/readn.c diff --git a/sys/src/lib/c/port/rune.c b/sys/src/lib/jehanne/port/rune.c similarity index 100% rename from sys/src/lib/c/port/rune.c rename to sys/src/lib/jehanne/port/rune.c diff --git a/sys/src/lib/c/port/runebase.c b/sys/src/lib/jehanne/port/runebase.c similarity index 100% rename from sys/src/lib/c/port/runebase.c rename to sys/src/lib/jehanne/port/runebase.c diff --git a/sys/src/lib/c/port/runebsearch.c b/sys/src/lib/jehanne/port/runebsearch.c similarity index 100% rename from sys/src/lib/c/port/runebsearch.c rename to sys/src/lib/jehanne/port/runebsearch.c diff --git a/sys/src/lib/c/port/runestrcat.c b/sys/src/lib/jehanne/port/runestrcat.c similarity index 100% rename from sys/src/lib/c/port/runestrcat.c rename to sys/src/lib/jehanne/port/runestrcat.c diff --git a/sys/src/lib/c/port/runestrchr.c b/sys/src/lib/jehanne/port/runestrchr.c similarity index 100% rename from sys/src/lib/c/port/runestrchr.c rename to sys/src/lib/jehanne/port/runestrchr.c diff --git a/sys/src/lib/c/port/runestrcmp.c b/sys/src/lib/jehanne/port/runestrcmp.c similarity index 100% rename from sys/src/lib/c/port/runestrcmp.c rename to sys/src/lib/jehanne/port/runestrcmp.c diff --git a/sys/src/lib/c/port/runestrcpy.c b/sys/src/lib/jehanne/port/runestrcpy.c similarity index 100% rename from sys/src/lib/c/port/runestrcpy.c rename to sys/src/lib/jehanne/port/runestrcpy.c diff --git a/sys/src/lib/c/port/runestrdup.c b/sys/src/lib/jehanne/port/runestrdup.c similarity index 100% rename from sys/src/lib/c/port/runestrdup.c rename to sys/src/lib/jehanne/port/runestrdup.c diff --git a/sys/src/lib/c/port/runestrecpy.c b/sys/src/lib/jehanne/port/runestrecpy.c similarity index 100% rename from sys/src/lib/c/port/runestrecpy.c rename to sys/src/lib/jehanne/port/runestrecpy.c diff --git a/sys/src/lib/c/port/runestrlen.c b/sys/src/lib/jehanne/port/runestrlen.c similarity index 100% rename from sys/src/lib/c/port/runestrlen.c rename to sys/src/lib/jehanne/port/runestrlen.c diff --git a/sys/src/lib/c/port/runestrncat.c b/sys/src/lib/jehanne/port/runestrncat.c similarity index 100% rename from sys/src/lib/c/port/runestrncat.c rename to sys/src/lib/jehanne/port/runestrncat.c diff --git a/sys/src/lib/c/port/runestrncmp.c b/sys/src/lib/jehanne/port/runestrncmp.c similarity index 100% rename from sys/src/lib/c/port/runestrncmp.c rename to sys/src/lib/jehanne/port/runestrncmp.c diff --git a/sys/src/lib/c/port/runestrncpy.c b/sys/src/lib/jehanne/port/runestrncpy.c similarity index 100% rename from sys/src/lib/c/port/runestrncpy.c rename to sys/src/lib/jehanne/port/runestrncpy.c diff --git a/sys/src/lib/c/port/runestrrchr.c b/sys/src/lib/jehanne/port/runestrrchr.c similarity index 100% rename from sys/src/lib/c/port/runestrrchr.c rename to sys/src/lib/jehanne/port/runestrrchr.c diff --git a/sys/src/lib/c/port/runestrstr.c b/sys/src/lib/jehanne/port/runestrstr.c similarity index 100% rename from sys/src/lib/c/port/runestrstr.c rename to sys/src/lib/jehanne/port/runestrstr.c diff --git a/sys/src/lib/c/port/runetype.c b/sys/src/lib/jehanne/port/runetype.c similarity index 100% rename from sys/src/lib/c/port/runetype.c rename to sys/src/lib/jehanne/port/runetype.c diff --git a/sys/src/lib/c/port/runetypebody-6.2.0.h b/sys/src/lib/jehanne/port/runetypebody-6.2.0.h similarity index 100% rename from sys/src/lib/c/port/runetypebody-6.2.0.h rename to sys/src/lib/jehanne/port/runetypebody-6.2.0.h diff --git a/sys/src/lib/c/port/sin.c b/sys/src/lib/jehanne/port/sin.c similarity index 100% rename from sys/src/lib/c/port/sin.c rename to sys/src/lib/jehanne/port/sin.c diff --git a/sys/src/lib/c/port/sinh.c b/sys/src/lib/jehanne/port/sinh.c similarity index 100% rename from sys/src/lib/c/port/sinh.c rename to sys/src/lib/jehanne/port/sinh.c diff --git a/sys/src/lib/c/port/strcat.c b/sys/src/lib/jehanne/port/strcat.c similarity index 100% rename from sys/src/lib/c/port/strcat.c rename to sys/src/lib/jehanne/port/strcat.c diff --git a/sys/src/lib/c/port/strchr.c b/sys/src/lib/jehanne/port/strchr.c similarity index 100% rename from sys/src/lib/c/port/strchr.c rename to sys/src/lib/jehanne/port/strchr.c diff --git a/sys/src/lib/c/port/strcmp.c b/sys/src/lib/jehanne/port/strcmp.c similarity index 100% rename from sys/src/lib/c/port/strcmp.c rename to sys/src/lib/jehanne/port/strcmp.c diff --git a/sys/src/lib/c/port/strcpy.c b/sys/src/lib/jehanne/port/strcpy.c similarity index 100% rename from sys/src/lib/c/port/strcpy.c rename to sys/src/lib/jehanne/port/strcpy.c diff --git a/sys/src/lib/c/port/strcspn.c b/sys/src/lib/jehanne/port/strcspn.c similarity index 100% rename from sys/src/lib/c/port/strcspn.c rename to sys/src/lib/jehanne/port/strcspn.c diff --git a/sys/src/lib/c/port/strdup.c b/sys/src/lib/jehanne/port/strdup.c similarity index 100% rename from sys/src/lib/c/port/strdup.c rename to sys/src/lib/jehanne/port/strdup.c diff --git a/sys/src/lib/c/port/strecpy.c b/sys/src/lib/jehanne/port/strecpy.c similarity index 100% rename from sys/src/lib/c/port/strecpy.c rename to sys/src/lib/jehanne/port/strecpy.c diff --git a/sys/src/lib/c/port/strlen.c b/sys/src/lib/jehanne/port/strlen.c similarity index 100% rename from sys/src/lib/c/port/strlen.c rename to sys/src/lib/jehanne/port/strlen.c diff --git a/sys/src/lib/c/port/strncat.c b/sys/src/lib/jehanne/port/strncat.c similarity index 100% rename from sys/src/lib/c/port/strncat.c rename to sys/src/lib/jehanne/port/strncat.c diff --git a/sys/src/lib/c/port/strncmp.c b/sys/src/lib/jehanne/port/strncmp.c similarity index 100% rename from sys/src/lib/c/port/strncmp.c rename to sys/src/lib/jehanne/port/strncmp.c diff --git a/sys/src/lib/c/port/strncpy.c b/sys/src/lib/jehanne/port/strncpy.c similarity index 100% rename from sys/src/lib/c/port/strncpy.c rename to sys/src/lib/jehanne/port/strncpy.c diff --git a/sys/src/lib/c/port/strpbrk.c b/sys/src/lib/jehanne/port/strpbrk.c similarity index 100% rename from sys/src/lib/c/port/strpbrk.c rename to sys/src/lib/jehanne/port/strpbrk.c diff --git a/sys/src/lib/c/port/strrchr.c b/sys/src/lib/jehanne/port/strrchr.c similarity index 100% rename from sys/src/lib/c/port/strrchr.c rename to sys/src/lib/jehanne/port/strrchr.c diff --git a/sys/src/lib/c/port/strspn.c b/sys/src/lib/jehanne/port/strspn.c similarity index 100% rename from sys/src/lib/c/port/strspn.c rename to sys/src/lib/jehanne/port/strspn.c diff --git a/sys/src/lib/c/port/strstr.c b/sys/src/lib/jehanne/port/strstr.c similarity index 100% rename from sys/src/lib/c/port/strstr.c rename to sys/src/lib/jehanne/port/strstr.c diff --git a/sys/src/lib/c/port/strtod.c b/sys/src/lib/jehanne/port/strtod.c similarity index 100% rename from sys/src/lib/c/port/strtod.c rename to sys/src/lib/jehanne/port/strtod.c diff --git a/sys/src/lib/c/port/strtok.c b/sys/src/lib/jehanne/port/strtok.c similarity index 100% rename from sys/src/lib/c/port/strtok.c rename to sys/src/lib/jehanne/port/strtok.c diff --git a/sys/src/lib/c/port/strtol.c b/sys/src/lib/jehanne/port/strtol.c similarity index 100% rename from sys/src/lib/c/port/strtol.c rename to sys/src/lib/jehanne/port/strtol.c diff --git a/sys/src/lib/c/port/strtoll.c b/sys/src/lib/jehanne/port/strtoll.c similarity index 100% rename from sys/src/lib/c/port/strtoll.c rename to sys/src/lib/jehanne/port/strtoll.c diff --git a/sys/src/lib/c/port/strtoul.c b/sys/src/lib/jehanne/port/strtoul.c similarity index 100% rename from sys/src/lib/c/port/strtoul.c rename to sys/src/lib/jehanne/port/strtoul.c diff --git a/sys/src/lib/c/port/strtoull.c b/sys/src/lib/jehanne/port/strtoull.c similarity index 100% rename from sys/src/lib/c/port/strtoull.c rename to sys/src/lib/jehanne/port/strtoull.c diff --git a/sys/src/lib/c/port/tan.c b/sys/src/lib/jehanne/port/tan.c similarity index 100% rename from sys/src/lib/c/port/tan.c rename to sys/src/lib/jehanne/port/tan.c diff --git a/sys/src/lib/c/port/tanh.c b/sys/src/lib/jehanne/port/tanh.c similarity index 100% rename from sys/src/lib/c/port/tanh.c rename to sys/src/lib/jehanne/port/tanh.c diff --git a/sys/src/lib/c/port/tokenize.c b/sys/src/lib/jehanne/port/tokenize.c similarity index 100% rename from sys/src/lib/c/port/tokenize.c rename to sys/src/lib/jehanne/port/tokenize.c diff --git a/sys/src/lib/c/port/toupper.c b/sys/src/lib/jehanne/port/toupper.c similarity index 100% rename from sys/src/lib/c/port/toupper.c rename to sys/src/lib/jehanne/port/toupper.c diff --git a/sys/src/lib/c/port/u16.c b/sys/src/lib/jehanne/port/u16.c similarity index 100% rename from sys/src/lib/c/port/u16.c rename to sys/src/lib/jehanne/port/u16.c diff --git a/sys/src/lib/c/port/u32.c b/sys/src/lib/jehanne/port/u32.c similarity index 100% rename from sys/src/lib/c/port/u32.c rename to sys/src/lib/jehanne/port/u32.c diff --git a/sys/src/lib/c/port/u64.c b/sys/src/lib/jehanne/port/u64.c similarity index 100% rename from sys/src/lib/c/port/u64.c rename to sys/src/lib/jehanne/port/u64.c diff --git a/sys/src/lib/c/port/utfecpy.c b/sys/src/lib/jehanne/port/utfecpy.c similarity index 100% rename from sys/src/lib/c/port/utfecpy.c rename to sys/src/lib/jehanne/port/utfecpy.c diff --git a/sys/src/lib/c/port/utflen.c b/sys/src/lib/jehanne/port/utflen.c similarity index 100% rename from sys/src/lib/c/port/utflen.c rename to sys/src/lib/jehanne/port/utflen.c diff --git a/sys/src/lib/c/port/utfnlen.c b/sys/src/lib/jehanne/port/utfnlen.c similarity index 100% rename from sys/src/lib/c/port/utfnlen.c rename to sys/src/lib/jehanne/port/utfnlen.c diff --git a/sys/src/lib/c/port/utfrrune.c b/sys/src/lib/jehanne/port/utfrrune.c similarity index 100% rename from sys/src/lib/c/port/utfrrune.c rename to sys/src/lib/jehanne/port/utfrrune.c diff --git a/sys/src/lib/c/port/utfrune.c b/sys/src/lib/jehanne/port/utfrune.c similarity index 100% rename from sys/src/lib/c/port/utfrune.c rename to sys/src/lib/jehanne/port/utfrune.c diff --git a/sys/src/lib/c/port/utfutf.c b/sys/src/lib/jehanne/port/utfutf.c similarity index 100% rename from sys/src/lib/c/port/utfutf.c rename to sys/src/lib/jehanne/port/utfutf.c diff --git a/sys/src/lib/klibs.json b/sys/src/lib/klibs.json index f433b5e..b6cf29a 100644 --- a/sys/src/lib/klibs.json +++ b/sys/src/lib/klibs.json @@ -1,7 +1,7 @@ { "klibs": { "Projects": [ - "/sys/src/lib/c/klibc.json", + "/sys/src/lib/jehanne/klibc.json", "/sys/src/lib/9p2000/klib9p2000.json", "/sys/src/lib/ip/klibip.json", "/sys/src/lib/draw/klibdraw.json", diff --git a/sys/src/lib/libs.json b/sys/src/lib/libs.json index 12fe5de..2913b7d 100644 --- a/sys/src/lib/libs.json +++ b/sys/src/lib/libs.json @@ -1,7 +1,7 @@ { "libs.json": { "Projects": [ - "/sys/src/lib/c/", + "/sys/src/lib/jehanne/", "/sys/src/lib/9p2000", "/sys/src/lib/ip/", "/sys/src/lib/draw/", diff --git a/sys/src/lib/posix/build.json b/sys/src/lib/posix/build.json index d53d6f1..3bb9c35 100644 --- a/sys/src/lib/posix/build.json +++ b/sys/src/lib/posix/build.json @@ -42,7 +42,7 @@ "-static", "-lposix", "-l9p2000", - "-lc" + "-ljehanne" ], "SourceFilesCmd": [ "posixly.c" diff --git a/sys/src/lib/posix/files.c b/sys/src/lib/posix/files.c index b02c67e..5539b97 100644 --- a/sys/src/lib/posix/files.c +++ b/sys/src/lib/posix/files.c @@ -344,6 +344,9 @@ POSIX_open(int *errnop, const char *name, int flags, int mode) } if(cperm == 0){ f = sys_open(name, omode); + } else if ((cperm&DMEXCL) != 0) { + cperm &= ~DMEXCL; + f = sys_create(name, (unsigned int)omode, (unsigned int)cperm); } else { f = ocreate(name, (unsigned int)omode, (unsigned int)cperm); }