jeremy/callisto
1
Fork 0
Code Releases Activity

cl: refactor fmesg to take file descriptors rather than FILE pointers

Browse source 
Might as well do it since we're on POSIX. Plus, I like the file
descriptor API much more than the ISO file handling API.
This commit is contained in:
Jeremy Baxter 2024-03-08 09:04:11 +13:00
parent 8f5818b925
commit 949811a6b2
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lcl.c
View file

@ -11,6 +11,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include <unistd.h> #include <unistd.h>
#include <libgen.h> #include <libgen.h>
#include <errno.h> #include <errno.h>
@ -22,9 +23,10 @@
#include "util.h" #include "util.h"
static void static void
fmesgshift(lua_State *L, FILE* f, int shift) fmesgshift(lua_State *L, int fd, int shift)
{ {
int paramc, i; int paramc, i;
char *bname;
char *progname; /* argv[0] */ char *progname; /* argv[0] */
lua_getglobal(L, "arg"); lua_getglobal(L, "arg");
@ -50,13 +52,18 @@ fmesgshift(lua_State *L, FILE* f, int shift)
} }
lua_call(L, paramc - shift, 1); lua_call(L, paramc - shift, 1);
fprintf(f, "%s: %s\n", basename(progname), lua_tostring(L, -1));
bname = basename(progname);
write(fd, bname, strlen(bname));
write(fd, ": ", 2);
write(fd, lua_tostring(L, -1), lua_rawlen(L, -1));
write(fd, "\n", 1);
} }
static void static void
fmesg(lua_State *L, FILE* f) fmesg(lua_State *L, int fd)
{ {
fmesgshift(L, f, 0); fmesgshift(L, fd, 0);
} }
/*** /***
@ -86,7 +93,7 @@ cl_error(lua_State *L)
{ {
luaL_checkstring(L, 1); luaL_checkstring(L, 1);
fmesg(L, stderr); fmesg(L, 2);
return 0; return 0;
} }
@ -115,7 +122,7 @@ cl_mesg(lua_State *L)
{ {
luaL_checkstring(L, 1); luaL_checkstring(L, 1);
fmesg(L, stdout); fmesg(L, 1);
return 0; return 0;
} }
@ -152,7 +159,7 @@ cl_panic(lua_State *L)
/* check arguments */ /* check arguments */
luaL_checkstring(L, 1 + codegiven); luaL_checkstring(L, 1 + codegiven);
fmesgshift(L, stderr, codegiven); fmesgshift(L, 2, codegiven);
/* exit */ /* exit */
lua_close(L); lua_close(L);