commit 2d6ffecb8d234554e9008ed12ff6a53f4ae0f9cb
parent ebcfd61855b90fd532f65e9d0d4a52855f0340c1
Author: leitner <leitner>
Date: Mon, 26 Nov 2001 17:37:22 +0000
import changes from libowfat
Diffstat:
8 files changed, 36 insertions(+), 34 deletions(-)
diff --git a/buffer.h b/buffer.h
@@ -10,8 +10,8 @@ typedef struct buffer {
int (*op)();
} buffer;
-#define BUFFER_INIT(op,fd,buf,len) { (buf), 0, (len), 0, (fd), (op) }
-#define BUFFER_INIT_READ(op,fd,buf,len) { (buf), 0, 0, (len), (fd), (op) }
+#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
@@ -28,7 +28,7 @@ extern int buffer_putsflush(buffer* b,const char* x);
extern int buffer_putspace(buffer* b);
#define buffer_PUTC(s,c) \
- ( ((s)->n != (s)->p) \
+ ( ((s)->a != (s)->p) \
? ( (s)->x[(s)->p++] = (c), 0 ) \
: buffer_put((s),&(c),1) \
)
@@ -44,12 +44,12 @@ extern int buffer_get_token(buffer* b,char* x,unsigned int len,const char* chars
extern char *buffer_peek(buffer* b);
extern void buffer_seek(buffer* b,unsigned int len);
-#define buffer_PEEK(s) ( (s)->x + (s)->n )
-#define buffer_SEEK(s,len) ( ( (s)->p -= (len) ) , ( (s)->n += (len) ) )
+#define buffer_PEEK(s) ( (s)->x + (s)->p )
+#define buffer_SEEK(s,len) ( (s)->p += (len) )
#define buffer_GETC(s,c) \
- ( ((s)->p > 0) \
- ? ( *(c) = (s)->x[(s)->n], buffer_SEEK((s),1), 1 ) \
+ ( ((s)->p < (s>->n) \
+ ? ( *(c) = *buffer_PEEK(s), buffer_SEEK((s),1), 1 ) \
: buffer_get((s),(c),1) \
)
diff --git a/buffer_put.c b/buffer_put.c
@@ -4,9 +4,9 @@
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->n-b->p) { /* doesn't fit */
+ if (len>b->a-b->p) { /* doesn't fit */
if (buffer_flush(b)==-1) return -1;
- if (len>b->n) {
+ if (len>b->a) {
if (buffer_stubborn(b->op,b->fd,buf,len)<0) return -1;
return 0;
}
diff --git a/buffer_puts.c b/buffer_puts.c
@@ -1,5 +1,6 @@
+#include "str.h"
#include "buffer.h"
int buffer_puts(buffer* b,const char* x) {
- return buffer_put(b,x,strlen(x));
+ return buffer_put(b,x,str_len(x));
}
diff --git a/buffer_putsflush.c b/buffer_putsflush.c
@@ -1,5 +1,6 @@
+#include "str.h"
#include "buffer.h"
int buffer_putsflush(buffer* b,const char* x) {
- return buffer_putflush(b,x,strlen(x));
+ return buffer_putflush(b,x,str_len(x));
}
diff --git a/byte.h b/byte.h
@@ -6,35 +6,32 @@
#ifndef __pure__
#define __pure__
#endif
-#ifndef __THROW
-#define __THROW
-#endif
/* byte_chr returns the smallest integer i between 0 and len-1
* inclusive such that one[i] equals needle, or len it not found. */
-unsigned int byte_chr(const void* haystack, unsigned int len, char needle) __THROW __pure__;
+unsigned int byte_chr(const void* haystack, unsigned int 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 int byte_rchr(const void* haystack,unsigned int len,char needle) __THROW __pure__;
+unsigned int byte_rchr(const void* haystack,unsigned int 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 int len, const void* in) __THROW;
+void byte_copy(void* out, unsigned int 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 int len, const void* in) __THROW;
+void byte_copyr(void* out, unsigned int 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 int len, const void* b) __THROW __pure__;
+int byte_diff(const void* a, unsigned int 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 len) __THROW;
+void byte_zero(void* out, unsigned len);
#define byte_equal(s,n,t) (!byte_diff((s),(n),(t)))
diff --git a/byte_copy.c b/byte_copy.c
@@ -5,7 +5,7 @@
void byte_copy(void* out, unsigned int len, const void* in) {
register char* s=out;
register const char* t=in;
- register const char* u=u+len;
+ register const char* u=t+len;
if (len>127) {
if (sizeof(unsigned long)>4) { /* a good compiler should optimize this check away */
for (;(unsigned long)t&7;) {
diff --git a/fmt.h b/fmt.h
@@ -1,6 +1,8 @@
#ifndef FMT_H
#define FMT_H
+#include "str.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 */
@@ -11,19 +13,19 @@
/* 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) ;
+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) ;
+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) ;
+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) ;
+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)
@@ -32,40 +34,40 @@ unsigned int fmt_8long(char *dest,unsigned long 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) ;
+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) ;
+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) ;
+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) ;
+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) ;
+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) ;
+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) ;
+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) ;
+unsigned int fmt_fill(char* dest,unsigned int srclen,unsigned int padlen,unsigned int maxlen);
#endif
diff --git a/minit.c b/minit.c
@@ -380,7 +380,8 @@ main(int argc, char *argv[]) {
{
struct sigaction sa;
sigemptyset(&sa.sa_mask);
- sa.sa_flags=SA_RESTART;
+ sa.sa_sigaction=0;
+ sa.sa_flags=SA_RESTART | SA_NOCLDSTOP;
sa.sa_handler=sigchild; sigaction(SIGCHLD,&sa,0);
sa.sa_handler=sigint; sigaction(SIGINT,&sa,0); /* ctrl-alt-del */
sa.sa_handler=sigwinch; sigaction(SIGWINCH,&sa,0); /* keyboard request */
