[Msyslog-cvs] syslog/src/modules im_udp.c,1.77,1.78

[<al...@us...>]

Update of /cvsroot/msyslog/syslog/src/modules
In directory usw-pr-cvs1:/tmp/cvs-serv9118/src/modules

Modified Files:
	im_udp.c 
Log Message:
fix copy of name (-1)
some style back
remember we use openbsd's style(9)


Index: im_udp.c
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/modules/im_udp.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- im_udp.c	24 Sep 2002 22:00:07 -0000	1.77
+++ im_udp.c	25 Sep 2002 07:25:52 -0000	1.78
@@ -109,8 +109,7 @@
 	/* parse args (skip module name) */
 	for (argcnt = 1; (ch = getxopt(argc, argv, "h!host: p!port: "
 	    "a!addhost q!nofqdn c!cachenames r!replacechar: n!noresolv",
-	    &argcnt)) != -1;
-	    argcnt++) {
+	    &argcnt)) != -1; argcnt++) {
 
 		switch (ch) {
 		case 'h':
@@ -246,37 +245,41 @@
 		strncat(ret->im_host, host, sizeof(ret->im_host));
 
     /* strip domain from hostname */
-    /* There is no assurance that the hostname is not an ip address
+    /* XXX: what is this?
+     * There is no assurance that the hostname is not an ip address
      * in which case stripping off the domain would be inappropriate.
      *
-	  if (c->flags & M_NOTFQDN) { 
-	    char   *dot;
-  		if ((dot = strchr(ret->im_host, '.')) != NULL) *dot = '\0';
-   	}
-    */
-	}
-  else {
-		/* extract host ip address from ip header, and attempt to look up the name */
+     */
+	} else {
 		struct hostent *hent;
 
+		/*
+		 * extract host ip address from ip header
+		 * and attempt to look up the name
+		 */
+
 		hent = gethostbyaddr((char *) &frominet.sin_addr,
 		    sizeof(frominet.sin_addr), frominet.sin_family);
+
 		if (hent) {
+
 			strncpy(ret->im_host, hent->h_name, sizeof(ret->im_host));
-      /* strip domain from hostname */
-	    if (c->flags & M_NOTFQDN) { 
-		    char   *dot;
-    		if ((dot = strchr(ret->im_host, '.')) != NULL) *dot = '\0';
-    	}
-		}
-    else {
-			strncpy(ret->im_host, inet_ntoa(frominet.sin_addr), sizeof(ret->im_host));
-		}
+
+			/* strip domain from hostname */
+			if (c->flags & M_NOTFQDN) { 
+				char   *dot;
+
+				if ((dot = strchr(ret->im_host, '.')) != NULL)
+					*dot = '\0';
+			}
+		} else
+			strncpy(ret->im_host, inet_ntoa(frominet.sin_addr),
+			    sizeof(ret->im_host) - 1);
 	}
 
 	ret->im_host[sizeof(ret->im_host) - 1] = '\0';
 
-return (1);
+	return (1);
 }
 
 int