* solaris cleanups and warning fixes

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index bcfb915521dafaad7a7733d8909b994a6c697442..d17a05919e1deafe543712fd709b7665db394be9 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 211.12  2000/04/06 20:37:01  nbryant
+* solaris cleanups and warning fixes
+
 Revision 211.11  2000/03/31 03:48:52  ajc
 * text_to_server() now behaves the way web users expect text entry to work.
   Soft linebreaks are soft, hard linebreaks are hard.  No indentation.
@@ -412,4 +415,3 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
-

diff --git a/webcit/configure.in b/webcit/configure.in
index 6c269ce204a32f7896146332dadf737452651b51..263d27d22924b5539910a8ad288aa45411dde45e 100644 (file)
--- a/webcit/configure.in
+++ b/webcit/configure.in
@@ -28,7 +28,19 @@ AC_SUBST(PTHREAD_DEFS)
 
 dnl Checks for programs.
 AC_PROG_CC
-test "$GCC" = yes && CFLAGS="$CFLAGS -Wall"
+
+dnl Configure compiler flags for GCC
+if test "$GCC" = yes; then
+       case "$host" in
+               *-*-solaris*)
+                       CFLAGS="$CFLAGS -Wall -Wno-char-subscripts"
+               ;;
+               *)
+                       CFLAGS="$CFLAGS -Wall"
+               ;;
+       esac
+fi
+
 missing_dir=`cd $ac_aux_dir && pwd`
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
 

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index c48e60b682551a9f8b7404236b45b9c0c208e2a4..edf2c1e830a55758aa031e3cb62a87122296124e 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -305,7 +305,7 @@ void do_generic(void)
        if (buf[0] == '7') {
                len = atol(&buf[4]);
                junk = malloc(len);
-               bzero(junk, len);
+               memset(junk, 0, len);
                serv_write(junk, len);
                free(junk);
        }

diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
index 8aaf4689db51d67bb7ddaa699d282f4fe9b27184..1c44f661b48649aa2453547ac7dd55f20a8c78ee 100644 (file)
--- a/webcit/tcp_sockets.c
+++ b/webcit/tcp_sockets.c
@@ -47,12 +47,12 @@ RETSIGTYPE timeout(int signum)
  */
 int uds_connectsock(char *sockpath)
 {
-       struct sockaddr_un sun;
+       struct sockaddr_un addr;
        int s;
 
-       memset(&sun, 0, sizeof(sun));
-       sun.sun_family = AF_UNIX;
-       strncpy(sun.sun_path, sockpath, sizeof sun.sun_path);
+       memset(&addr, 0, sizeof(addr));
+       addr.sun_family = AF_UNIX;
+       strncpy(addr.sun_path, sockpath, sizeof addr.sun_path);
 
        s = socket(AF_UNIX, SOCK_STREAM, 0);
        if (s < 0) {
@@ -61,7 +61,7 @@ int uds_connectsock(char *sockpath)
                return(-1);
        }
 
-       if (connect(s, (struct sockaddr *) &sun, sizeof(sun)) < 0) {
+       if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
                fprintf(stderr, "can't connect: %s\n",
                        strerror(errno));
                return(-1);
@@ -82,7 +82,7 @@ int tcp_connectsock(char *host, char *service)
        struct sockaddr_in sin;
        int s;
 
-       bzero((char *) &sin, sizeof(sin));
+       memcpy(&sin, 0, sizeof(sin));
        sin.sin_family = AF_INET;
 
        pse = getservbyname(service, "tcp");
@@ -94,7 +94,7 @@ int tcp_connectsock(char *host, char *service)
        }
        phe = gethostbyname(host);
        if (phe) {
-               bcopy(phe->h_addr, (char *) &sin.sin_addr, phe->h_length);
+               memcpy(&sin.sin_addr, phe->h_addr, phe->h_length);
        } else if ((sin.sin_addr.s_addr = inet_addr(host)) == INADDR_NONE) {
                fprintf(stderr, "Can't get %s host entry: %s\n",
                        host, strerror(errno));

diff --git a/webcit/webserver.c b/webcit/webserver.c
index ff4679744ad815c29e26dda11721fe7d5f3f42a7..b0f8b73bd506adf065f8a06607e2f1f83fde36ce 100644 (file)
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -297,7 +297,7 @@ int main(int argc, char **argv)
 
        /* now the original thread becomes an ordinary worker thread */
        worker_entry();
-       pthread_exit(NULL);
+       return 0;
 }