Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 17 Mar 2009 19:51:04 +0000 (UTC)
From:      David Malone <dwmalone@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r189936 - head/release/picobsd/tinyware/simple_httpd
Message-ID:  <200903171951.n2HJp4ER004808@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: dwmalone
Date: Tue Mar 17 19:51:04 2009
New Revision: 189936
URL: http://svn.freebsd.org/changeset/base/189936

Log:
  Warns fixes: use putenv rather than setenv to avoid constness problems,
  when we want to print an off_t cast to intmax_t and use %jd.
  
  Up WARNS to 6.

Modified:
  head/release/picobsd/tinyware/simple_httpd/Makefile
  head/release/picobsd/tinyware/simple_httpd/simple_httpd.c

Modified: head/release/picobsd/tinyware/simple_httpd/Makefile
==============================================================================
--- head/release/picobsd/tinyware/simple_httpd/Makefile	Tue Mar 17 19:38:40 2009	(r189935)
+++ head/release/picobsd/tinyware/simple_httpd/Makefile	Tue Mar 17 19:51:04 2009	(r189936)
@@ -3,5 +3,6 @@
 PROG=simple_httpd
 SRCS= 	simple_httpd.c
 NO_MAN=
+WARNS?=6
 
 .include <bsd.prog.mk>

Modified: head/release/picobsd/tinyware/simple_httpd/simple_httpd.c
==============================================================================
--- head/release/picobsd/tinyware/simple_httpd/simple_httpd.c	Tue Mar 17 19:38:40 2009	(r189935)
+++ head/release/picobsd/tinyware/simple_httpd/simple_httpd.c	Tue Mar 17 19:51:04 2009	(r189936)
@@ -42,6 +42,7 @@
 #include <netdb.h>
 #include <signal.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
@@ -278,7 +279,7 @@ http_request(void)
                /*printf("HTTP/1.0 200 OK\nContent-type: text/html\n\n\n");*/
 	       printf("HTTP/1.0 200 OK\r\n");
                /* Plug in environment variable, others in log_line */
-	       putenv("SERVER_SOFTWARE=FreeBSD/PicoBSD");
+	       setenv("SERVER_SOFTWARE", "FreeBSD/PicoBSD", 1);
 
 	       execlp (filename,filename,par,(char *)0);
               } 
@@ -331,7 +332,7 @@ http_request(void)
 	http_output(httpd_server_ident);
 	http_date();
 
-	sprintf(buff, "Content-length: %lld\r\n", file_status.st_size);
+	sprintf(buff, "Content-length: %jd\r\n", (intmax_t)file_status.st_size);
 	write(con_sock, buff, strlen(buff));
 
 	strcpy(buff, "Content-type: ");

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903171951.n2HJp4ER004808>