Import ncpfs 2.2.0

lib/com_err/Makefile

@@ -5,14 +5,13 @@
 OBJECTS = com_err.o error_message.o et_name.o init_et.o
 CFLAGS = -Wall -O2 $(PIC_FLAG)
 
-all: ../libcom_err.a
-
-../libcom_err.a: $(OBJECTS)
-	ar r ../libcom_err.a $(OBJECTS)
+all: $(OBJECTS)
 
 dep:
 	$(CPP) -M $(INCLUDES) *.c > .depend
 
+install:
+
 clean:
 	rm -f *.o ../libcom_err.a
 

lib/com_err/com_err.c

@@ -17,25 +17,28 @@
 
 static void
 #ifdef __STDC__
- default_com_err_proc(const char *whoami, errcode_t code, const
-		      char *fmt, va_list args)
+default_com_err_proc(const char *whoami, errcode_t code, const
+		     char *fmt, va_list args)
 #else
- default_com_err_proc(whoami, code, fmt, args)
+default_com_err_proc(whoami, code, fmt, args)
 const char *whoami;
 errcode_t code;
 const char *fmt;
 va_list args;
 #endif
 {
-	if (whoami) {
+	if (whoami)
+	{
 		fputs(whoami, stderr);
 		fputs(": ", stderr);
 	}
-	if (code) {
+	if (code)
+	{
 		fputs(error_message(code), stderr);
 		fputs(" ", stderr);
 	}
-	if (fmt) {
+	if (fmt)
+	{
 		vfprintf(stderr, fmt, args);
 	}
 	/* should do this only on a tty in raw mode */
@@ -53,10 +56,12 @@ typedef void (*errf) ();
 errf com_err_hook = default_com_err_proc;
 
 #ifdef __STDC__
-void com_err_va(const char *whoami, errcode_t code, const char *fmt,
-		va_list args)
+void
+com_err_va(const char *whoami, errcode_t code, const char *fmt,
+	   va_list args)
 #else
-void com_err_va(whoami, code, fmt, args)
+void
+com_err_va(whoami, code, fmt, args)
 const char *whoami;
 errcode_t code;
 const char *fmt;
@@ -67,12 +72,14 @@ va_list args;
 }
 
 #ifndef VARARGS
-void com_err(const char *whoami,
-	     errcode_t code,
-	     const char *fmt,...)
+void
+com_err(const char *whoami,
+	errcode_t code,
+	const char *fmt,...)
 {
 #else
-void com_err(va_alist)
+void
+com_err(va_alist)
 va_dcl
 {
 	const char *whoami, *fmt;

lib/com_err/compile_et

@@ -2,7 +2,7 @@
 #
 #
 AWK=/usr/bin/awk
-DIR=com_err/
+DIR=../lib/com_err
 
 ROOT=`echo $1 | sed -e s/.et$//`
 BASE=`basename $ROOT`

lib/com_err/error_message.c

@@ -24,10 +24,10 @@ struct et_list *_et_list = (struct et_list *) NULL;
 
 #ifdef __STDC__
 const char *
- error_message(errcode_t code)
+error_message(errcode_t code)
 #else
 const char *
- error_message(code)
+error_message(code)
 errcode_t code;
 #endif
 {
@@ -39,7 +39,8 @@ errcode_t code;
 
 	offset = code & ((1 << ERRCODE_RANGE) - 1);
 	table_num = code - offset;
-	if (!table_num) {
+	if (!table_num)
+	{
 #ifdef HAS_SYS_ERRLIST
 		if (offset < sys_nerr)
 			return (sys_errlist[offset]);
@@ -53,8 +54,10 @@ errcode_t code;
 			goto oops;
 #endif
 	}
-	for (et = _et_list; et; et = et->next) {
-		if (et->table->base == table_num) {
+	for (et = _et_list; et; et = et->next)
+	{
+		if (et->table->base == table_num)
+		{
 			/* This is the right table */
 			if (et->table->n_msgs <= offset)
 				goto oops;
@@ -63,17 +66,21 @@ errcode_t code;
 	}
       oops:
 	strcpy(buffer, "Unknown code ");
-	if (table_num) {
+	if (table_num)
+	{
 		strcat(buffer, error_table_name(table_num));
 		strcat(buffer, " ");
 	}
-	for (cp = buffer; *cp; cp++);
-	if (offset >= 100) {
+	for (cp = buffer; *cp; cp++)
+		;
+	if (offset >= 100)
+	{
 		*cp++ = '0' + offset / 100;
 		offset %= 100;
 		started++;
 	}
-	if (started || offset >= 10) {
+	if (started || offset >= 10)
+	{
 		*cp++ = '0' + offset / 10;
 		offset %= 10;
 	}

lib/com_err/error_table.h

@@ -11,12 +11,14 @@
 #define const
 #endif
 
-struct error_table {
+struct error_table
+{
 	char const *const *msgs;
 	long base;
 	int n_msgs;
 };
-struct et_list {
+struct et_list
+{
 	struct et_list *next;
 	const struct error_table *table;
 };

lib/com_err/et_name.c

@@ -14,7 +14,7 @@ static const char char_set[] =
 static char buf[6];
 
 const char *
- error_table_name(num)
+error_table_name(num)
 int num;
 {
 	int ch;
@@ -27,7 +27,8 @@ int num;
 	/* num = ?? ??? ??? aaa aaa bbb bbb ccc ccc ddd ddd */
 	num &= 077777777;
 	/* num = 00 000 000 aaa aaa bbb bbb ccc ccc ddd ddd */
-	for (i = 4; i >= 0; i--) {
+	for (i = 4; i >= 0; i--)
+	{
 		ch = (num >> BITS_PER_CHAR * i) & ((1 << BITS_PER_CHAR) - 1);
 		if (ch != 0)
 			*p++ = char_set[ch - 1];

lib/com_err/init_et.c

@@ -23,7 +23,8 @@
 #define const
 #endif
 
-struct foobar {
+struct foobar
+{
 	struct et_list etl;
 	struct error_table et;
 };
@@ -31,9 +32,11 @@ struct foobar {
 extern struct et_list *_et_list;
 
 #ifdef __STDC__
-int init_error_table(const char *const *msgs, int base, int count)
+int
+init_error_table(const char *const *msgs, int base, int count)
 #else
-int init_error_table(msgs, base, count)
+int
+init_error_table(msgs, base, count)
 const char *const *msgs;
 int base;
 int count;