[BACK]Return to server.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/server.c between version 1.23 and 1.24

version 1.23, 2009/08/18 21:37:04 version 1.24, 2009/08/23 17:29:51
Line 188 
Line 188 
                             &cause, "%s: %s", strerror(errno), SYSTEM_CFG);                              &cause, "%s: %s", strerror(errno), SYSTEM_CFG);
                         goto error;                          goto error;
                 }                  }
         } else if (load_cfg(SYSTEM_CFG, &cause) != 0)          } else if (load_cfg(SYSTEM_CFG, NULL, &cause) != 0)
                 goto error;                  goto error;
         if (cfg_file != NULL && load_cfg(cfg_file, &cause) != 0)          if (cfg_file != NULL && load_cfg(cfg_file, NULL, &cause) != 0)
                 goto error;                  goto error;
   
         exit(server_main(srv_fd));          exit(server_main(srv_fd));
Legend:
Removed from v.1.23  
changed lines
  Added in v.1.24