diff --git a/src/core/os.c b/src/core/os.c index fc08fd1b..0f2bb820 100644 --- a/src/core/os.c +++ b/src/core/os.c @@ -456,29 +456,61 @@ static const uint8_t *janet_decode_mode(mode_t m) { #endif /* Getters */ -static Janet os_stat_dev(struct stat *st) { return janet_wrap_number(st->st_dev); } -static Janet os_stat_inode(struct stat *st) { return janet_wrap_number(st->st_ino); } -static Janet os_stat_mode(struct stat *st) { return janet_wrap_keyword(janet_decode_mode(st->st_mode)); } -static Janet os_stat_permissions(struct stat *st) { return janet_wrap_string(janet_decode_permissions(st->st_mode)); } -static Janet os_stat_uid(struct stat *st) { return janet_wrap_number(st->st_uid); } -static Janet os_stat_gid(struct stat *st) { return janet_wrap_number(st->st_gid); } -static Janet os_stat_nlink(struct stat *st) { return janet_wrap_number(st->st_nlink); } -static Janet os_stat_rdev(struct stat *st) { return janet_wrap_number(st->st_rdev); } -static Janet os_stat_size(struct stat *st) { return janet_wrap_number(st->st_size); } -static Janet os_stat_accessed(struct stat *st) { return janet_wrap_number((double) st->st_atime); } -static Janet os_stat_modified(struct stat *st) { return janet_wrap_number((double) st->st_mtime); } -static Janet os_stat_changed(struct stat *st) { return janet_wrap_number((double) st->st_ctime); } +static Janet os_stat_dev(struct stat *st) { + return janet_wrap_number(st->st_dev); +} +static Janet os_stat_inode(struct stat *st) { + return janet_wrap_number(st->st_ino); +} +static Janet os_stat_mode(struct stat *st) { + return janet_wrap_keyword(janet_decode_mode(st->st_mode)); +} +static Janet os_stat_permissions(struct stat *st) { + return janet_wrap_string(janet_decode_permissions(st->st_mode)); +} +static Janet os_stat_uid(struct stat *st) { + return janet_wrap_number(st->st_uid); +} +static Janet os_stat_gid(struct stat *st) { + return janet_wrap_number(st->st_gid); +} +static Janet os_stat_nlink(struct stat *st) { + return janet_wrap_number(st->st_nlink); +} +static Janet os_stat_rdev(struct stat *st) { + return janet_wrap_number(st->st_rdev); +} +static Janet os_stat_size(struct stat *st) { + return janet_wrap_number(st->st_size); +} +static Janet os_stat_accessed(struct stat *st) { + return janet_wrap_number((double) st->st_atime); +} +static Janet os_stat_modified(struct stat *st) { + return janet_wrap_number((double) st->st_mtime); +} +static Janet os_stat_changed(struct stat *st) { + return janet_wrap_number((double) st->st_ctime); +} #ifdef JANET_WINDOWS -static Janet os_stat_blocks(struct stat *st) { return janet_wrap_number(0); } -static Janet os_stat_blocksize(struct stat *st) { return janet_wrap_number(0); } +static Janet os_stat_blocks(struct stat *st) { + return janet_wrap_number(0); +} +static Janet os_stat_blocksize(struct stat *st) { + return janet_wrap_number(0); +} #else -static Janet os_stat_blocks(struct stat *st) { return janet_wrap_number(st->st_blocks); } -static Janet os_stat_blocksize(struct stat *st) { return janet_wrap_number(st->st_blksize); } +static Janet os_stat_blocks(struct stat *st) { + return janet_wrap_number(st->st_blocks); +} +static Janet os_stat_blocksize(struct stat *st) { + return janet_wrap_number(st->st_blksize); +} #endif struct OsStatGetter { const char *name; - Janet (*fn)(struct stat *st); + Janet(*fn)(struct stat *st); }; static const struct OsStatGetter os_stat_getters[] = { diff --git a/tools/cook.janet b/tools/cook.janet index 3a033fa9..ed792f11 100644 --- a/tools/cook.janet +++ b/tools/cook.janet @@ -20,7 +20,7 @@ (defn- rm "Remove a directory and all sub directories." [path] - (if (= ((os/stat path) :mode) :directory) + (if (= (os/stat path :mode) :directory) (do (each subpath (os/dir path) (rm subpath)) (os/rmdir path)) @@ -32,8 +32,8 @@ (def f (file/open dest)) (if (not f) (break true)) (file/close f) - (let [mod-dest ((os/stat dest) :modified) - mod-src ((os/stat src) :modified)] + (let [mod-dest (os/stat dest :modified) + mod-src (os/stat src :modified)] (< mod-dest mod-src))) (defn- needs-build-some