[uClinux-dev] [patch] cleanup user/sysutils/

[Greg Ungerer]

Hi Mike,

Mike Frysinger wrote:
> attached patch cleans up all the warnings in the code that i get but more 
> importantly, i drop the linux include as that header is not installed with 
> sanitized kernel headers

Applied, thanks.

Regards
Greg



> ------------------------------------------------------------------------
> 
> Index: user/sysutils/df.c
> ===================================================================
> RCS file: /var/cvs/uClinux-dist/user/sysutils/df.c,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 df.c
> --- user/sysutils/df.c	19 Sep 2002 04:26:06 -0000	1.1.1.1
> +++ user/sysutils/df.c	7 Jan 2007 08:36:51 -0000
> @@ -9,22 +9,15 @@
>   * the Free Software Foundation; either version 2 of the License, or
>   * (at your option) any later version.
>   */
> -#include <linux/autoconf.h>
> -
>  #include <stdio.h>
>  #include <fcntl.h>
>  #include <sys/types.h>
>  #include <sys/vfs.h>
> -
> +#include <stdlib.h>
> +#include <string.h>
>  #include <sys/stat.h>
> -#include <dirent.h>
> -#include <pwd.h>
> -#include <grp.h>
>  #include <time.h>
> -#include <linux/major.h>
> -#include <linux/types.h>
>  #include <sys/time.h>
> -#include <asm/param.h>
>  #include <errno.h>
>  
>  int
> Index: user/sysutils/free.c
> ===================================================================
> RCS file: /var/cvs/uClinux-dist/user/sysutils/free.c,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 free.c
> --- user/sysutils/free.c	19 Sep 2002 04:26:06 -0000	1.1.1.1
> +++ user/sysutils/free.c	7 Jan 2007 08:36:51 -0000
> @@ -10,17 +10,9 @@
>   * (at your option) any later version.
>   */
>  
> -#include <linux/autoconf.h>
> -
>  #include <stdio.h>
> +#include <stdlib.h>
>  #include <fcntl.h>
> -#include <sys/types.h>
> -
> -#include <sys/stat.h>
> -#include <dirent.h>
> -#include <pwd.h>
> -#include <grp.h>
> -#include <time.h>
>  
>  char buf[256];
>  
> Index: user/sysutils/hostname.c
> ===================================================================
> RCS file: /var/cvs/uClinux-dist/user/sysutils/hostname.c,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 hostname.c
> --- user/sysutils/hostname.c	19 Sep 2002 04:26:06 -0000	1.1.1.1
> +++ user/sysutils/hostname.c	7 Jan 2007 08:36:51 -0000
> @@ -3,6 +3,8 @@
>  #include <sys/types.h>
>  #include <sys/param.h>
>  #include <stdio.h>
> +#include <stdlib.h>
> +#include <string.h>
>  #include <unistd.h>
>  
>  int main(int argc, char *argv[])
> Index: user/sysutils/ps.c
> ===================================================================
> RCS file: /var/cvs/uClinux-dist/user/sysutils/ps.c,v
> retrieving revision 1.1.1.2
> diff -u -p -r1.1.1.2 ps.c
> --- user/sysutils/ps.c	10 Aug 2005 00:23:03 -0000	1.1.1.2
> +++ user/sysutils/ps.c	7 Jan 2007 08:36:51 -0000
> @@ -10,13 +10,12 @@
>   * (at your option) any later version.
>   */
>  
> -#include <linux/autoconf.h>
> -
>  #include <stdio.h>
>  #include <fcntl.h>
>  #include <stdlib.h>
>  #include <sys/types.h>
>  #include <string.h>
> +#include <unistd.h>
>  #include <sys/stat.h>
>  #include <dirent.h>
>  #include <pwd.h>
> @@ -64,7 +63,6 @@ main(argc, argv)
>  {
>  	int i;
>  	int h;
> -	int max;
>  	FILE * f;
>  	DIR * d;
>  	unsigned long bytes, sbytes;
> @@ -73,7 +71,6 @@ main(argc, argv)
>  	int l;
>  	time_t time_now;
>  	long uptime_secs;
> -	float idle_secs;
>  	float seconds, start, total_time;
>  	int utime, stime, start_time;
>  	int pcpu;
> @@ -114,9 +111,9 @@ main(argc, argv)
>  	
>  	d = opendir("/proc");
>  	if (!d)
> -		return;
> +		return 1;
>  	
> -	while (de = readdir(d)) {
> +	while ((de = readdir(d)) != NULL) {
>  	
>  	
>  		for(i=0;i<strlen(de->d_name);i++)
> Index: user/sysutils/reboot.c
> ===================================================================
> RCS file: /var/cvs/uClinux-dist/user/sysutils/reboot.c,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 reboot.c
> --- user/sysutils/reboot.c	19 Sep 2002 04:26:06 -0000	1.1.1.1
> +++ user/sysutils/reboot.c	7 Jan 2007 08:36:51 -0000
> @@ -12,10 +12,10 @@
>   * AUG/99 -- added delay option to reboot
>   */
>  
> -#include <linux/autoconf.h>
> -
> +#include <stdio.h>
>  #include <string.h>
>  #include <stdlib.h>
> +#include <unistd.h>
>  #include <fcntl.h>
>  #include <sys/types.h>
>  
> Index: user/sysutils/shutdown.c
> ===================================================================
> RCS file: /var/cvs/uClinux-dist/user/sysutils/shutdown.c,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 shutdown.c
> --- user/sysutils/shutdown.c	19 Sep 2002 04:26:06 -0000	1.1.1.1
> +++ user/sysutils/shutdown.c	7 Jan 2007 08:36:51 -0000
> @@ -10,8 +10,10 @@
>   * (at your option) any later version.
>   */
>  
> -#include <linux/autoconf.h>
>  
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <unistd.h>
>  #include <string.h>
>  #include <fcntl.h>
>  #include <sys/types.h>
> 
> 
> ------------------------------------------------------------------------
> 
> _______________________________________________
> uClinux-dev mailing list
> uClinux-dev at uclinux.org
> http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
> This message was resent by uclinux-dev at uclinux.org
> To unsubscribe see:
> http://mailman.uclinux.org/mailman/options/uclinux-dev

-- 
------------------------------------------------------------------------
Greg Ungerer  --  Chief Software Dude       EMAIL:     gerg at snapgear.com
SnapGear -- a Secure Computing Company      PHONE:       +61 7 3435 2888
825 Stanley St,                             FAX:         +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia         WEB: http://www.SnapGear.com