commit e748420be1f14188cbff7b9d76850bb16fd461ca
parent d16595bb7f67b665348fca8b9653a31b8afc5861
Author: leitner <leitner>
Date: Sat, 25 Dec 2004 16:54:58 +0000
rip out old libowfat copy, require real libowfat instead
add serdo (to run n commands in sequence)
Diffstat:
22 files changed, 255 insertions(+), 483 deletions(-)
diff --git a/CHANGES b/CHANGES
@@ -21,6 +21,9 @@
the kernel command line. The first time they are to be started will
then be skipped. Use this, for example, to not start the dhcp
client when your notebook is not plugged in a network.
+ add serdo (execute batch, no shell features whatsoever)
+ make "msvc servicename" output easier to parse if not outputting to a tty
+ require libowfat instead of shipping half of it ourselves
0.9.1:
fix embarassing typo in msvc (Gelu G. Lupas)
diff --git a/Makefile b/Makefile
@@ -1,8 +1,7 @@
all: minit msvc pidfilehack hard-reboot write_proc killall5 shutdown \
-minit-update
+minit-update serdo
#CFLAGS=-pipe -march=i386 -fomit-frame-pointer -Os -I../dietlibc/include
-DIET=diet
CC=gcc
CFLAGS=-Wall -W -pipe -fomit-frame-pointer -Os
CROSS=
@@ -10,19 +9,41 @@ CROSS=
LDFLAGS=-s
MANDIR=/usr/man
-minit: minit.o split.o openreadclose.o fmt_ulong.o str_len.o opendevconsole.o
- $(DIET) $(CROSS)$(CC) $(LDFLAGS) -o minit $^
-
-msvc: msvc.o fmt_ulong.o buffer_1.o buffer_2.o buffer_puts.o \
-buffer_putsflush.o buffer_putulong.o buffer_put.o byte_copy.o \
-buffer_flush.o buffer_stubborn.o buffer_putflush.o str_len.o \
-str_start.o
- $(DIET) $(CROSS)$(CC) $(LDFLAGS) -o msvc $^
-
-minit-update: minit-update.o buffer_1.o buffer_2.o buffer_puts.o \
-buffer_putsflush.o buffer_put.o buffer_flush.o buffer_stubborn.o \
-buffer_putflush.o byte_copy.o split.o str_len.o openreadclose.o
- $(DIET) $(CROSS)$(CC) $(LDFLAGS) -o minit-update $^
+path = $(subst :, ,$(PATH))
+diet_path = $(foreach dir,$(path),$(wildcard $(dir)/diet))
+ifeq ($(strip $(diet_path)),)
+ifneq ($(wildcard /opt/diet/bin/diet),)
+DIET=/opt/diet/bin/diet
+else
+DIET=
+endif
+else
+DIET:=$(strip $(diet_path))
+endif
+
+ifneq ($(DEBUG),)
+CFLAGS+=-g
+LDFLAGS+=-g
+else
+CFLAGS+=-O2 -fomit-frame-pointer
+LDFLAGS+=-s
+ifneq ($(DIET),)
+DIET+=-Os
+endif
+endif
+
+LDLIBS=-lowfat
+
+libowfat_path = $(strip $(foreach dir,../libowfat*,$(wildcard $(dir)/textcode.h)))
+ifneq ($(libowfat_path),)
+CFLAGS+=$(foreach fnord,$(libowfat_path),-I$(dir $(fnord)))
+LDFLAGS+=$(foreach fnord,$(libowfat_path),-L$(dir $(fnord)))
+endif
+
+minit: minit.o split.o openreadclose.o opendevconsole.o
+msvc: msvc.o
+minit-update: minit-update.o split.o openreadclose.o
+serdo: serdo.o
shutdown: shutdown.o split.o openreadclose.o opendevconsole.o
$(DIET) $(CROSS)$(CC) $(LDFLAGS) -o shutdown $^
@@ -30,6 +51,9 @@ shutdown: shutdown.o split.o openreadclose.o opendevconsole.o
%.o: %.c
$(DIET) $(CROSS)$(CC) $(CFLAGS) -c $<
+%: %.o
+ $(DIET) $(CROSS)$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+
clean:
rm -f *.o minit msvc pidfilehack hard-reboot write_proc killall5 \
shutdown
@@ -72,27 +96,3 @@ tar: clean rename
rename:
if test $(CURNAME) != $(VERSION); then cd .. && mv $(CURNAME) $(VERSION); fi
-buffer_1.o: buffer_1.c buffer.h
-buffer_2.o: buffer_2.c buffer.h
-buffer_flush.o: buffer_flush.c buffer.h
-buffer_put.o: buffer_put.c byte.h buffer.h
-buffer_putflush.o: buffer_putflush.c buffer.h
-buffer_puts.o: buffer_puts.c str.h buffer.h
-buffer_putsflush.o: buffer_putsflush.c str.h buffer.h
-buffer_putulong.o: buffer_putulong.c buffer.h fmt.h
-buffer_stubborn.o: buffer_stubborn.c buffer.h
-byte_copy.o: byte_copy.c byte.h
-fmt_ulong.o: fmt_ulong.c fmt.h
-hard-reboot.o: hard-reboot.c
-killall5.o: killall5.c
-minit.o: minit.c fmt.h str.h
-msvc.o: msvc.c str.h fmt.h buffer.h
-openreadclose.o: openreadclose.c
-pidfilehack.o: pidfilehack.c
-shutdown.o: shutdown.c
-split.o: split.c
-str_len.o: str_len.c str.h
-str_start.o: str_start.c str.h
-t.o: t.c
-write_proc.o: write_proc.c
-opendevconsole.o: opendevconsole.c
diff --git a/buffer.h b/buffer.h
@@ -1,74 +0,0 @@
-#ifndef BUFFER_H
-#define BUFFER_H
-
-typedef struct buffer {
- char *x;
- unsigned int p;
- unsigned int n;
- unsigned int a;
- int fd;
- int (*op)();
-} buffer;
-
-#define BUFFER_INIT(op,fd,buf,len) { (buf), 0, 0, (len), (fd), (op) }
-#define BUFFER_INIT_READ(op,fd,buf,len) BUFFER_INIT(op,fd,buf,len) /*obsolete*/
-#define BUFFER_INSIZE 8192
-#define BUFFER_OUTSIZE 8192
-
-extern void buffer_init(buffer* b,int (*op)(),int fd,char* y,unsigned int ylen);
-
-extern int buffer_flush(buffer* b);
-extern int buffer_put(buffer* b,const char* x,unsigned int len);
-extern int buffer_putalign(buffer* b,const char* x,unsigned int len);
-extern int buffer_putflush(buffer* b,const char* x,unsigned int len);
-extern int buffer_puts(buffer* b,const char* x);
-extern int buffer_putsalign(buffer* b,const char* x);
-extern int buffer_putsflush(buffer* b,const char* x);
-
-extern int buffer_putspace(buffer* b);
-
-#define buffer_PUTC(s,c) \
- ( ((s)->a != (s)->p) \
- ? ( (s)->x[(s)->p++] = (c), 0 ) \
- : buffer_put((s),&(c),1) \
- )
-
-extern int buffer_get(buffer* b,char* x,unsigned int len);
-extern int buffer_bget(buffer* b,char* x,unsigned int len);
-extern int buffer_feed(buffer* b);
-extern int buffer_getc(buffer* b,char* x);
-extern int buffer_getn(buffer* b,char* x,unsigned int len);
-
-/* read bytes until the destination buffer is full (len bytes), end of
- * file is reached or the read char is in charset (setlen bytes). An
- * empty line when looking for \n will write '\n' to x and return 0. If
- * EOF is reached, \0 is written to the buffer */
-extern int buffer_get_token(buffer* b,char* x,unsigned int len,const char* charset,unsigned int setlen);
-#define buffer_getline(b,x,len) buffer_get_token((b),(x),(len),"\n",1)
-
-extern char *buffer_peek(buffer* b);
-extern void buffer_seek(buffer* b,unsigned int len);
-
-#define buffer_PEEK(s) ( (s)->x + (s)->p )
-#define buffer_SEEK(s,len) ( (s)->p += (len) )
-
-#define buffer_GETC(s,c) \
- ( ((s)->p < (s>->n) \
- ? ( *(c) = *buffer_PEEK(s), buffer_SEEK((s),1), 1 ) \
- : buffer_get((s),(c),1) \
- )
-
-extern int buffer_copy(buffer* out,buffer* in);
-
-extern int buffer_putulong(buffer *b,unsigned long l);
-extern int buffer_put8long(buffer *b,unsigned long l);
-extern int buffer_putxlong(buffer *b,unsigned long l);
-extern int buffer_putlong(buffer *b,unsigned long l);
-
-extern buffer *buffer_0;
-extern buffer *buffer_0small;
-extern buffer *buffer_1;
-extern buffer *buffer_1small;
-extern buffer *buffer_2;
-
-#endif
diff --git a/buffer_1.c b/buffer_1.c
@@ -1,10 +0,0 @@
-#include <unistd.h>
-#include "buffer.h"
-#ifdef __MINGW32__
-#include <io.h>
-#endif
-
-char buffer_1_space[BUFFER_INSIZE];
-static buffer it = BUFFER_INIT(write,1,buffer_1_space,sizeof buffer_1_space);
-buffer *buffer_1 = ⁢
-
diff --git a/buffer_2.c b/buffer_2.c
@@ -1,7 +0,0 @@
-#include <unistd.h>
-#include "buffer.h"
-
-char buffer_2_space[BUFFER_INSIZE];
-static buffer it = BUFFER_INIT(write,2,buffer_2_space,sizeof buffer_2_space);
-buffer *buffer_2 = ⁢
-
diff --git a/buffer_flush.c b/buffer_flush.c
@@ -1,10 +0,0 @@
-#include "buffer.h"
-
-extern int buffer_stubborn(int (*op)(),int fd,const char* buf, unsigned int len);
-
-extern int buffer_flush(buffer* b) {
- register int p;
- if (!(p=b->p)) return 0; /* buffer already empty */
- b->p=0;
- return buffer_stubborn(b->op,b->fd,b->x,p);
-}
diff --git a/buffer_put.c b/buffer_put.c
@@ -1,17 +0,0 @@
-#include "byte.h"
-#include "buffer.h"
-
-extern int buffer_stubborn(int (*op)(),int fd,const char* buf, unsigned int len);
-
-int buffer_put(buffer* b,const char* buf,unsigned int len) {
- if (len>b->a-b->p) { /* doesn't fit */
- if (buffer_flush(b)==-1) return -1;
- if (len>b->a) {
- if (buffer_stubborn(b->op,b->fd,buf,len)<0) return -1;
- return 0;
- }
- }
- byte_copy(b->x+b->p, len, buf);
- b->p+=len;
- return 0;
-}
diff --git a/buffer_putflush.c b/buffer_putflush.c
@@ -1,7 +0,0 @@
-#include "buffer.h"
-
-int buffer_putflush(buffer* b,const char* x,unsigned int len) {
- if (buffer_put(b,x,len)<0) return -1;
- if (buffer_flush(b)<0) return -1;
- return 0;
-}
diff --git a/buffer_puts.c b/buffer_puts.c
@@ -1,6 +0,0 @@
-#include "str.h"
-#include "buffer.h"
-
-int buffer_puts(buffer* b,const char* x) {
- return buffer_put(b,x,str_len(x));
-}
diff --git a/buffer_putsflush.c b/buffer_putsflush.c
@@ -1,6 +0,0 @@
-#include "str.h"
-#include "buffer.h"
-
-int buffer_putsflush(buffer* b,const char* x) {
- return buffer_putflush(b,x,str_len(x));
-}
diff --git a/buffer_putulong.c b/buffer_putulong.c
@@ -1,8 +0,0 @@
-#include "buffer.h"
-#include "fmt.h"
-
-int buffer_putulong(buffer *b,unsigned long l) {
- char buf[FMT_ULONG];
- return buffer_put(b,buf,fmt_ulong(buf,l));
-}
-
diff --git a/buffer_stubborn.c b/buffer_stubborn.c
@@ -1,15 +0,0 @@
-#include <errno.h>
-#include "buffer.h"
-
-int buffer_stubborn(int (*op)(),int fd,const char* buf, unsigned int len) {
- int w;
- while (len) {
- if ((w=op(fd,buf,len))<0) {
- if (errno == EINTR) continue;
- return -1;
- };
- buf+=w;
- len-=w;
- }
- return 0;
-}
diff --git a/byte.h b/byte.h
@@ -1,40 +0,0 @@
-#ifndef BYTE_H
-#define BYTE_H
-
-#ifdef __dietlibc__
-#include <sys/cdefs.h>
-#endif
-
-#ifndef __pure__
-#define __pure__
-#endif
-
-/* byte_chr returns the smallest integer i between 0 and len-1
- * inclusive such that one[i] equals needle, or len if not found. */
-unsigned long byte_chr(const void* haystack, unsigned long len, char needle) __pure__;
-
-/* byte_rchr returns the largest integer i between 0 and len-1 inclusive
- * such that one[i] equals needle, or len if not found. */
-unsigned long byte_rchr(const void* haystack,unsigned long len,char needle) __pure__;
-
-/* byte_copy copies in[0] to out[0], in[1] to out[1], ... and in[len-1]
- * to out[len-1]. */
-void byte_copy(void* out, unsigned long len, const void* in);
-
-/* byte_copyr copies in[len-1] to out[len-1], in[len-2] to out[len-2],
- * ... and in[0] to out[0] */
-void byte_copyr(void* out, unsigned long len, const void* in);
-
-/* byte_diff returns negative, 0, or positive, depending on whether the
- * string a[0], a[1], ..., a[len-1] is lexicographically smaller
- * than, equal to, or greater than the string b[0], b[1], ...,
- * b[len-1]. When the strings are different, byte_diff does not read
- * bytes past the first difference. */
-int byte_diff(const void* a, unsigned long len, const void* b) __pure__;
-
-/* byte_zero sets the bytes out[0], out[1], ..., out[len-1] to 0 */
-void byte_zero(void* out, unsigned long len);
-
-#define byte_equal(s,n,t) (!byte_diff((s),(n),(t)))
-
-#endif
diff --git a/byte_copy.c b/byte_copy.c
@@ -1,28 +0,0 @@
-#include "byte.h"
-
-/* byte_copy copies in[0] to out[0], in[1] to out[1], ... and in[len-1]
- * to out[len-1]. */
-void byte_copy(void* out, unsigned long len, const void* in) {
- register char* s=out;
- register const char* t=in;
- register const char* u=t+len;
- if (len>127) {
- while ((unsigned long)s&(sizeof(unsigned long)-1)) {
- if (t==u) break; *s=*t; ++s; ++t;
- }
- /* s (destination) is now unsigned long aligned */
-#ifndef __i386__
- if (!((unsigned long)t&(sizeof(unsigned long)-1)))
-#endif
- while (t+sizeof(unsigned long)<=u) {
- *(unsigned long*)s=*(unsigned long*)t;
- s+=sizeof(unsigned long); t+=sizeof(unsigned long);
- }
- }
- for (;;) {
- if (t==u) break; *s=*t; ++s; ++t;
- if (t==u) break; *s=*t; ++s; ++t;
- if (t==u) break; *s=*t; ++s; ++t;
- if (t==u) break; *s=*t; ++s; ++t;
- }
-}
diff --git a/fmt.h b/fmt.h
@@ -1,71 +0,0 @@
-#ifndef FMT_H
-#define FMT_H
-
-#define FMT_ULONG 40 /* enough space to hold 2^128 - 1 in decimal, plus \0 */
-#define FMT_8LONG 44 /* enough space to hold 2^128 - 1 in octal, plus \0 */
-#define FMT_XLONG 33 /* enough space to hold 2^128 - 1 in hexadecimal, plus \0 */
-#define FMT_LEN ((char *) 0) /* convenient abbreviation */
-
-/* The formatting routines do not append \0!
- * Use them like this: buf[fmt_ulong(buf,number)]=0; */
-
-/* convert signed src integer -23 to ASCII '-','2','3', return length.
- * If dest is not NULL, write result to dest */
-unsigned int fmt_long(char *dest,signed long src);
-
-/* convert unsigned src integer 23 to ASCII '2','3', return length.
- * If dest is not NULL, write result to dest */
-unsigned int fmt_ulong(char *dest,unsigned long src);
-
-/* convert unsigned src integer 0x23 to ASCII '2','3', return length.
- * If dest is not NULL, write result to dest */
-unsigned int fmt_xlong(char *dest,unsigned long src);
-
-/* convert unsigned src integer 023 to ASCII '2','3', return length.
- * If dest is not NULL, write result to dest */
-unsigned int fmt_8long(char *dest,unsigned long src);
-
-#define fmt_uint(dest,src) fmt_ulong(dest,src)
-#define fmt_int(dest,src) fmt_long(dest,src)
-#define fmt_xint(dest,src) fmt_xlong(dest,src)
-#define fmt_8int(dest,src) fmt_8long(dest,src)
-
-/* Like fmt_ulong, but prepend '0' while length is smaller than padto.
- * Does not truncate! */
-unsigned int fmt_ulong0(char *,unsigned long src,unsigned int padto);
-
-#define fmt_uint0(buf,src,padto) fmt_ulong0(buf,src,padto)
-
-/* convert src double 1.7 to ASCII '1','.','7', return length.
- * If dest is not NULL, write result to dest */
-unsigned int fmt_double(char *dest, double d,int max,int prec);
-
-/* if src is negative, write '-' and return 1.
- * if src is positive, write '+' and return 1.
- * otherwise return 0 */
-unsigned int fmt_plusminus(char *dest,int src);
-
-/* if src is negative, write '-' and return 1.
- * otherwise return 0. */
-unsigned int fmt_minus(char *dest,int src);
-
-/* copy str to dest until \0 byte, return number of copied bytes. */
-unsigned int fmt_str(char *dest,const char *src);
-
-/* copy str to dest until \0 byte or limit bytes copied.
- * return number of copied bytes. */
-unsigned int fmt_strn(char *dest,const char *src,unsigned int limit);
-
-/* "foo" -> " foo"
- * write padlen-srclen spaces, if that is >= 0. Then copy srclen
- * characters from src. Truncate only if total length is larger than
- * maxlen. Return number of characters written. */
-unsigned int fmt_pad(char* dest,const char* src,unsigned int srclen,unsigned int padlen,unsigned int maxlen);
-
-/* "foo" -> "foo "
- * append padlen-srclen spaces after dest, if that is >= 0. Truncate
- * only if total length is larger than maxlen. Return number of
- * characters written. */
-unsigned int fmt_fill(char* dest,unsigned int srclen,unsigned int padlen,unsigned int maxlen);
-
-#endif
diff --git a/fmt_ulong.c b/fmt_ulong.c
@@ -1,11 +0,0 @@
-#include "fmt.h"
-
-unsigned int fmt_ulong(char *dest,unsigned long i) {
- register unsigned long len,tmp,len2;
- /* first count the number of bytes needed */
- for (len=1, tmp=i; tmp>9; ++len) tmp/=10;
- if (dest)
- for (tmp=i, dest+=len, len2=len+1; --len2; tmp/=10)
- *--dest = (tmp%10)+'0';
- return len;
-}
diff --git a/minit-update.c b/minit-update.c
@@ -3,6 +3,7 @@
#include <fcntl.h>
#include <sys/file.h>
#include <sys/types.h>
+#include <sys/stat.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
diff --git a/msvc.c b/msvc.c
@@ -4,11 +4,14 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
+#include <unistd.h>
#include "str.h"
#include "fmt.h"
#include "buffer.h"
#define NOVARS
#include "minit.h"
+#include <errmsg.h>
+#include <errno.h>
static int infd,outfd;
@@ -100,7 +103,7 @@ void dumphistory() {
done=i=0;
if (first) {
if (tmp[0]=='0') {
- buffer_putsflush(buffer_2,"msvc: minit compiled without history support.\n");
+ carp("minit compiled without history support.");
return;
}
i+=2;
@@ -138,9 +141,7 @@ void dumpdependencies(char* service) {
done=i=0;
if (first) {
if (tmp[0]=='0') {
- buffer_puts(buffer_2,"msvc: ");
- buffer_puts(buffer_2,service);
- buffer_putsflush(buffer_2,": no such service.\n");
+ carp(service,": no such service.");
return;
}
i+=2;
@@ -165,7 +166,7 @@ void dumpdependencies(char* service) {
int main(int argc,char *argv[]) {
if (argc<2) {
- buffer_putsflush(buffer_1,
+ msg(
"usage: msvc -[uodpchaitkogC] service\n"
" msvc -Ppid service\n"
" -u\tup; start service with respawn\n"
@@ -182,38 +183,49 @@ int main(int argc,char *argv[]) {
" -Ppid\tset PID of service (for pidfilehack)\n"
" -D service\tprint services started as dependency\n"
" -H\tprint last n respawned services\n"
- " -C\tClear; remove service form active list\n\n");
+ " -C\tClear; remove service form active list\n");
return 0;
}
+ errmsg_iam("msvc");
infd=open(MINITROOT "/in",O_WRONLY);
outfd=open(MINITROOT "/out",O_RDONLY);
if (infd>=0) {
while (lockf(infd,F_LOCK,1)) {
- buffer_putsflush(buffer_2,"could not acquire lock!\n");
+ carp("could not acquire lock!");
sleep(1);
}
if (argc==2 && argv[1][1]!='H') {
pid_t pid=__readpid(argv[1]);
if (buf[0]!='0') {
unsigned long len;
- buffer_puts(buffer_1,argv[1]);
- buffer_puts(buffer_1,": ");
- if (pid==0) buffer_puts(buffer_1,"down ");
- else if (pid==1) buffer_puts(buffer_1,"finished ");
- else {
- buffer_puts(buffer_1,"up (pid ");
- buffer_putulong(buffer_1,pid);
- buffer_puts(buffer_1,") ");
+ unsigned long ut=uptime(argv[1]);
+
+ if (isatty(1)) {
+ char tmp[FMT_ULONG+20];
+ char tmp2[FMT_ULONG];
+ char* what;
+
+ if (pid==0) what="down "; else
+ if (pid==1) what="finished "; else {
+ len=fmt_str(tmp,"up (pid ");
+ len+=fmt_ulong(tmp+len,pid);
+ tmp[len+fmt_str(tmp+len,") ")]=0;
+ what=tmp;
+ }
+ tmp2[fmt_ulong(tmp2,ut)]=0;
+ msg(argv[1],": ",what,tmp2," seconds");
+ } else {
+ char tmp[FMT_ULONG*2+5];
+ len=fmt_ulong(tmp,pid);
+ tmp[len]=' '; ++len;
+ len+=fmt_ulong(tmp+len,ut);
+ tmp[len]='\n';
+ write(1,tmp,len+1);
}
- len=uptime(argv[1]);
- buffer_putulong(buffer_1,len);
- buffer_putsflush(buffer_1," seconds\n");
+
if (pid==0) return 2; else if (pid==1) return 3; else return 0;
- } else {
- buffer_puts(buffer_2,"msvc: ");
- buffer_puts(buffer_2,argv[1]);
- buffer_putsflush(buffer_2,": no such service.\n");
- }
+ } else
+ carp(argv[1],": no such service.");
return 1;
} else {
int i;
@@ -226,13 +238,14 @@ int main(int argc,char *argv[]) {
for (i=2; i<argc; ++i) {
pid=__readpid(argv[i]);
if (pid<2) {
- buffer_puts(buffer_2,"msvc: ");
- buffer_puts(buffer_2,argv[i]);
- buffer_putsflush(buffer_2,pid==1?": service terminated\n":": no such service\n");
+ carp(argv[i],pid==1?": service terminated":": no such service");
ret=1;
+ } else {
+ char tmp[FMT_ULONG];
+ int i;
+ tmp[i=fmt_ulong(tmp,pid)]='\n';
+ write(1,tmp,i+1);
}
- buffer_putulong(buffer_1,pid);
- buffer_putsflush(buffer_1,"\n");
}
break;
case 'p': sig=SIGSTOP; goto dokill; break;
@@ -245,9 +258,7 @@ int main(int argc,char *argv[]) {
case 'o':
for (i=2; i<argc; ++i)
if (startservice(argv[i]) || respawn(argv[i],0)) {
- buffer_puts(buffer_2,"Could not start ");
- buffer_puts(buffer_2,argv[i]);
- buffer_putsflush(buffer_2,"\n");
+ carp("Could not start ",argv[i]);
ret=1;
}
break;
@@ -255,9 +266,7 @@ int main(int argc,char *argv[]) {
for (i=2; i<argc; ++i) {
pid=__readpid(argv[i]);
if (pid==0) {
- buffer_puts(buffer_2,"msvc: ");
- buffer_puts(buffer_2,argv[i]);
- buffer_putsflush(buffer_2,": no such service\n");
+ carp(argv[i],": no such service");
ret=1;
} else if (pid==1)
continue;
@@ -268,17 +277,14 @@ int main(int argc,char *argv[]) {
case 'u':
for (i=2; i<argc; ++i)
if (startservice(argv[i]) || respawn(argv[i],1)) {
- buffer_puts(buffer_2,"Could not start ");
- buffer_puts(buffer_2,argv[i]);
- buffer_putsflush(buffer_2,"\n");
+ carp("Could not start ",argv[i]);
ret=1;
}
break;
case 'C':
for (i=2; i<argc; ++i)
if (check_remove(argv[i])) {
- buffer_puts(buffer_2,argv[i]);
- buffer_putsflush(buffer_2," had terminated or was killed\n");
+ carp(argv[i]," could not be cleared");
ret=1;
}
break;
@@ -286,9 +292,7 @@ int main(int argc,char *argv[]) {
pid=atoi(argv[1]+2);
if (pid>1)
if (setpid(argv[2],pid)) {
- buffer_puts(buffer_2,"Could not set pid of service ");
- buffer_puts(buffer_2,argv[2]);
- buffer_putsflush(buffer_2,"\n");
+ carp("Could not set PID of service ",argv[2]);
ret=1;
}
break;
@@ -305,25 +309,28 @@ dokill:
for (i=2; i<argc; i++) {
pid=__readpid(argv[i]);
if (!pid) {
- buffer_puts(buffer_2,"msvc: ");
- buffer_puts(buffer_2,argv[i]);
- buffer_putsflush(buffer_2,": no such service!\n");
+ carp(argv[i],": no such service");
ret=1;
} else if (kill(pid,sig)) {
- buffer_puts(buffer_2,"msvc: ");
- buffer_puts(buffer_2,argv[i]);
- buffer_puts(buffer_2,": could not send signal ");
- buffer_putulong(buffer_2,sig);
- buffer_puts(buffer_2," to PID ");
- buffer_putulong(buffer_2,pid);
- buffer_putsflush(buffer_2,"\n");
+ char tmp[FMT_ULONG];
+ char tmp2[FMT_ULONG];
+ char* s;
+ switch (errno) {
+ case EINVAL: s="invalid signal"; break;
+ case EPERM: s="permission denied"; break;
+ case ESRCH: s="no such pid"; break;
+ default: s="unknown error";
+ }
+ tmp[fmt_ulong(tmp,sig)]=0;
+ tmp2[fmt_ulong(tmp2,pid)]=0;
+ carp(argv[i],": could not send signal ",tmp," to PID ",pid,": ",s);
ret=1;
}
}
return ret;
}
} else {
- buffer_putsflush(buffer_2,"minit: could not open " MINITROOT "/in or " MINITROOT "/out\n");
+ carp("minit: could not open " MINITROOT "/in or " MINITROOT "/out");
return 1;
}
}
diff --git a/serdo.c b/serdo.c
@@ -0,0 +1,152 @@
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <ctype.h>
+#include <errmsg.h>
+#include <sys/wait.h>
+#include <str.h>
+#include <byte.h>
+
+#define MAXENV 256
+char* envp[MAXENV+2];
+int envc;
+
+int envset(char* s) {
+ int i,l;
+ if (s[l=str_chr(s,'=')]!='=') return -1;
+ ++l;
+ for (i=0; i<envc; ++i)
+ if (byte_equal(envp[i],l,s)) {
+ envp[i]=s;
+ return 0;
+ }
+ if (envc<MAXENV) {
+ envp[envc]=s;
+ envp[++envc]=0;
+ return 0;
+ }
+ return -1;
+}
+
+int spawn(char** argv, int last) {
+ int i;
+ if (str_equal(argv[0],"cd")) {
+ if (chdir(argv[1])==-1) {
+ carpsys("chdir failed");
+ return -1;
+ }
+ return 0;
+ } else if (str_equal(argv[0],"export")) {
+ for (i=1; argv[i]; ++i) envset(argv[i]);
+ return 0;
+ }
+ if (!last) {
+ if ((i=fork())==-1) diesys(1,"cannot fork");
+ } else i=0;
+ if (!i) {
+ /* child */
+ _exit(execvp(argv[0],argv));
+ }
+ if (waitpid(i,&i,0)==-1) diesys(1,"waitpid failed");
+ if (!WIFEXITED(i))
+ return -1;
+ return WEXITSTATUS(i);
+}
+
+int run(char* s,int last) {
+ int i,spaces;
+ char** argv,**next;;
+ for (i=spaces=0; s[i]; ++i) if (s[i]==' ') ++spaces;
+ next=argv=alloca((spaces+1)*sizeof(char*));
+ while (*s) {
+ while (*s && isspace(*s)) ++s;
+ if (*s=='"') {
+ ++s;
+ *next=s;
+ while (*s && s[-1] != '\\' && *s != '"') ++s;
+ if (!*s) {
+ --*next;
+ break;
+ }
+ *s=0;
+ ++s;
+ } else if (*s=='\'') {
+ ++s;
+ *next=s;
+ while (*s && s[-1] != '\\' && *s != '\'') ++s;
+ if (!*s) {
+ --*next;
+ break;
+ }
+ *s=0;
+ ++s;
+ } else {
+ *next=s;
+ while (*s && *s!=' ' && *s!='\t') ++s;
+ if (!*s) break;
+ *s=0;
+ ++s;
+ }
+ ++next;
+ }
+ *++next=0;
+
+ return spawn(argv,last);
+}
+
+int execute(char* s) {
+ char* start;
+ int r;
+ r=0;
+ while (*s) {
+ int last;
+ while (isspace(*s)) ++s;
+ if (*s == '#') {
+ while (*s && *s != '\n') ++s;
+ continue;
+ }
+ start=s;
+
+ while (*s && *s != '\n') ++s;
+ if (*s) {
+ char* tmp;
+ *s=0;
+ ++s;
+ for (tmp=s; *tmp; ++tmp)
+ if (!isspace(*tmp) && *tmp=='#') {
+ for (tmp=s+1; *tmp && *tmp!='\n'; ++tmp) ;
+ } else break;
+ last=(*tmp==0);
+ } else
+ last=1;
+ r=run(start,last);
+ }
+ return r;
+}
+
+int batch(char* s) {
+ struct stat ss;
+ int fd=open(s,O_RDONLY);
+ char* map;
+ if (fd==-1) diesys(1,"could not open ",s);
+ if (fstat(fd,&ss)==-1) diesys(1,"could not stat ",s);
+ if (ss.st_size>32768) die(1,"file ",s," is too large");
+ map=alloca(ss.st_size+1);
+ if (read(fd,map,ss.st_size)!=(long)ss.st_size) diesys(1,"read error");
+ map[ss.st_size]=0;
+ close(fd);
+
+ return execute(map);
+}
+
+int main(int argc,char* argv[],char* env[]) {
+ int r;
+ (void)argc;
+ errmsg_iam("serdo");
+ for (envc=0; envc<MAXENV && env[envc]; ++envc) envp[envc]=env[envc];
+ envp[envc]=0;
+ while (*++argv)
+ if ((r=batch(*argv)))
+ return r;
+ return 0;
+}
diff --git a/str.h b/str.h
@@ -1,50 +0,0 @@
-#ifndef STR_H
-#define STR_H
-
-#ifdef __dietlibc__
-#include <sys/cdefs.h>
-#endif
-#ifndef __pure__
-#define __pure__
-#endif
-
-/* str_copy copies leading bytes from in to out until \0.
- * return number of copied bytes. */
-extern unsigned long str_copy(char *out,const char *in);
-
-/* str_diff returns negative, 0, or positive, depending on whether the
- * string a[0], a[1], ..., a[n]=='\0' is lexicographically smaller than,
- * equal to, or greater than the string b[0], b[1], ..., b[m-1]=='\0'.
- * If the strings are different, str_diff does not read bytes past the
- * first difference. */
-extern int str_diff(const char *a,const char *b) __pure__;
-
-/* str_diffn returns negative, 0, or positive, depending on whether the
- * string a[0], a[1], ..., a[n]=='\0' is lexicographically smaller than,
- * equal to, or greater than the string b[0], b[1], ..., b[m-1]=='\0'.
- * If the strings are different, str_diffn does not read bytes past the
- * first difference. The strings will be considered equal if the first
- * limit characters match. */
-extern int str_diffn(const char *a,const char *b,unsigned long limit) __pure__;
-
-#ifdef __dietlibc__
-#include <string.h>
-#define str_len(foo) strlen(foo)
-#else
-/* str_len returns the index of \0 in s */
-extern unsigned long str_len(const char *s) __pure__;
-#endif
-
-/* str_chr returns the index of the first occurance of needle or \0 in haystack */
-extern unsigned long str_chr(const char *haystack,char needle) __pure__;
-
-/* str_rchr returns the index of the last occurance of needle or \0 in haystack */
-extern unsigned long str_rchr(const char *haystack,char needle) __pure__;
-
-/* str_start returns 1 if the b is a prefix of a, 0 otherwise */
-extern int str_start(const char *a,const char *b) __pure__;
-
-/* convenience shortcut to test for string equality */
-#define str_equal(s,t) (!str_diff((s),(t)))
-
-#endif
diff --git a/str_len.c b/str_len.c
@@ -1,17 +0,0 @@
-#include "str.h"
-
-#ifdef __dietlibc__
-#undef str_len
-unsigned long str_len(const char* in) __attribute__((alias("strlen")));
-#else
-unsigned long str_len(const char* in) {
- register const char* t=in;
- for (;;) {
- if (!*t) break; ++t;
- if (!*t) break; ++t;
- if (!*t) break; ++t;
- if (!*t) break; ++t;
- }
- return t-in;
-}
-#endif
diff --git a/str_start.c b/str_start.c
@@ -1,14 +0,0 @@
-#include "str.h"
-
-/* str_start returns 1 if the b is a prefix of a, 0 otherwise */
-int str_start(const char* a, const char* b) {
- register const char* s=a;
- register const char* t=b;
- for (;;) {
- if (!*t) return 1; if (*s!=*t) break; ++s; ++t;
- if (!*t) return 1; if (*s!=*t) break; ++s; ++t;
- if (!*t) return 1; if (*s!=*t) break; ++s; ++t;
- if (!*t) return 1; if (*s!=*t) break; ++s; ++t;
- }
- return 0;
-}
