[BACK]Return to ctrl.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / builtin

Diff for /OpenXM_contrib2/asir2000/builtin/ctrl.c between version 1.42 and 1.43

version 1.42, 2014/05/13 15:02:28 version 1.43, 2014/05/26 09:34:06
Line 45 
Line 45 
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *   *
  * $OpenXM: OpenXM_contrib2/asir2000/builtin/ctrl.c,v 1.41 2014/05/12 02:35:35 ohara Exp $   * $OpenXM: OpenXM_contrib2/asir2000/builtin/ctrl.c,v 1.42 2014/05/13 15:02:28 ohara Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
Line 57 
Line 57 
 #include <sys/types.h>  #include <sys/types.h>
 #include <sys/socket.h>  #include <sys/socket.h>
 #include <sys/wait.h>  #include <sys/wait.h>
   #include <sys/utsname.h>
 #endif  #endif
   
 static struct {  static struct {
Line 289  void Psysinfo(LIST *rp)
Line 290  void Psysinfo(LIST *rp)
 }  }
   
 #if !defined(VISUAL)  #if !defined(VISUAL)
 static char *uname(char *option)  static char *myuname(char *option)
 {  {
     char buf[BUFSIZ];      char buf[BUFSIZ];
     char *s;      char *s;
     int fd[2], status;      int fd[2], status, pid;
     *buf = 0;      *buf = 0;
     if (socketpair(AF_UNIX, SOCK_STREAM, 0, fd) < 0) {      if (socketpair(AF_UNIX, SOCK_STREAM, 0, fd) < 0) {
         *buf = 0; return "";          *buf = 0; return NULL;
     }      }
     if (fork() == 0) {      pid = fork();
       if (pid < 0) {
           return NULL;
       }else if (pid == 0) {
         dup2(fd[1], 1);          dup2(fd[1], 1);
           close(2);
         execlp("uname", "uname", option, NULL);          execlp("uname", "uname", option, NULL);
     }      }
       waitpid(pid, &status, 0);
       if (status) { /* error */
           return NULL;
       }
     s = buf;      s = buf;
     if( !read(fd[0], s, BUFSIZ-1) || (s = strchr(s, '\n')) ) {      if( !read(fd[0], s, BUFSIZ-1) || (s = strchr(s, '\n')) ) {
         *s = 0;          *s = 0;
     }      }
     wait(&status);  
     close(fd[0]);      close(fd[0]);
     close(fd[1]);      close(fd[1]);
     s = (char *)MALLOC(strlen(buf)+1);      s = (char *)MALLOC(strlen(buf)+1);
Line 316  static char *uname(char *option)
Line 324  static char *uname(char *option)
   
 static void get_sysinfo()  static void get_sysinfo()
 {  {
       static struct utsname u;
     static int initialized = 0;      static int initialized = 0;
     if (initialized) {      if (initialized) {
         return;          return;
     }      }
     initialized = 1;      initialized = 1;
     sysinfo.kernel = uname(NULL);      uname(&u);
       sysinfo.kernel = u.sysname;
 #if defined(__DARWIN__)  #if defined(__DARWIN__)
     sysinfo.type   = "macosx";      sysinfo.type   = "macosx";
     sysinfo.name   = sysinfo.kernel;      sysinfo.name   = sysinfo.kernel;
 #else  #else
     sysinfo.type   = "unix";      sysinfo.type   = "unix";
     sysinfo.name   = uname("-o"); // not work on Darwin      sysinfo.name   = myuname("-o"); // not work on Darwin
       if (!sysinfo.name) {
           sysinfo.name = sysinfo.kernel;
       }
 #endif  #endif
     sysinfo.arch   = uname("-m");      sysinfo.arch   = u.machine;
     sysinfo.release= uname("-r");      sysinfo.release= u.release;
     sysinfo.full   = uname("-a");      sysinfo.full   = myuname("-a");
 }  }
   
 #else  #else
Legend:
Removed from v.1.42  
changed lines
  Added in v.1.43
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>