[Netadm-devel] gwc/gwcadmd main.c,1.4,1.5

[&#46629;&#44844; <lin...@us...>]

Update of /cvsroot/netadm/gwc/gwcadmd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8043

Modified Files:
	main.c 
Log Message:
FIX: 
    sometime show_kversion return -1 in kernel 2.6.x,
    so i fix this, but i think this is not tested sufficiently.
     


Index: main.c
===================================================================
RCS file: /cvsroot/netadm/gwc/gwcadmd/main.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** main.c	5 Feb 2006 13:18:30 -0000	1.4
--- main.c	12 Feb 2006 18:45:11 -0000	1.5
***************
*** 899,904 ****
  show_kversion (void) {
    struct utsname uts;
-   char *c;
-   char kver[4];
  
    if ( uname (&uts) < 0 ) {
--- 899,902 ----
***************
*** 906,928 ****
    } 
    else {
!     strncpy (kver, uts.release, 3);
!     
!     if ( !strcmp (kver, "2.6"))
!       printf ("%s\n", kver);
! 
!     else if ( !strcmp (kver, "2.4")) {
!       c = strchr (uts.release, '.');
!       ++c;
!       c = strchr (c, '.');
!       ++c;
!       bzero (kver, sizeof (kver));
!       strncpy (kver, c, 2);
!       if ( atoi (kver) < 20 )
!         printf ("%d\n", -1);
!       else
!         printf ("2.4\n");
!     }
!     else
!       printf ("%d\n", -1);
    }
  }
--- 904,908 ----
    } 
    else {
!     printf ("%.3s\n", uts.release);
    }
  }