patches/screen-gcc4.diff

   1 --- screen-4.0.2/fileio.c.xx    2005-04-08 13:37:18.823774606 +0200
   2 +++ screen-4.0.2/fileio.c       2005-04-08 13:37:25.948324113 +0200
   3 @@ -779,7 +779,7 @@
   4  #ifdef SIGPIPE
   5        signal(SIGPIPE, SIG_DFL);
   6  #endif
   7 -      execl("/bin/sh", "sh", "-c", cmd, 0);
   8 +      execl("/bin/sh", "sh", "-c", cmd, (char*)0);
   9        Panic(errno, "/bin/sh");
  10      default:
  11        break;
  12 --- screen-4.0.2/utmp.c.orig    2005-10-28 22:01:14.105418912 +0000
  13 +++ screen-4.0.2/utmp.c 2005-10-28 22:02:30.065801507 +0000
  14 @@ -604,6 +604,7 @@ struct utmp *u;
  15  char *line, *user;
  16  int pid;
  17  {
  18 +  time_t t;
  19    u->ut_type = USER_PROCESS;
  20    strncpy(u->ut_user, user, sizeof(u->ut_user));
  21    /* Now the tricky part... guess ut_id */
  22 @@ -618,7 +619,8 @@ int pid;
  23  #endif /* sgi */
  24    strncpy(u->ut_line, line, sizeof(u->ut_line));
  25    u->ut_pid = pid;
  26 -  (void)time((time_t *)&u->ut_time);
  27 +  (void)time(&t);
  28 +  u->ut_time = t;
  29  }
  30
  31  static slot_t
  32 @@ -726,9 +728,11 @@ struct utmp *u;
  33  char *line, *user;
  34  int pid;
  35  {
  36 +  time_t t;
  37    strncpy(u->ut_line, line, sizeof(u->ut_line));
  38    strncpy(u->ut_name, user, sizeof(u->ut_name));
  39 -  (void)time((time_t *)&u->ut_time);
  40 +  (void)time(&t);
  41 +  u->ut_time = t;
  42  }
  43
  44  static slot_t