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

Diff for /src/usr.bin/tmux/cfg.c between version 1.55 and 1.56

version 1.55, 2017/04/05 10:45:39 version 1.56, 2017/04/21 13:15:43
Line 32 
Line 32 
 int               cfg_finished;  int               cfg_finished;
 static char     **cfg_causes;  static char     **cfg_causes;
 static u_int      cfg_ncauses;  static u_int      cfg_ncauses;
 struct client    *cfg_client;  
   
 static enum cmd_retval  static enum cmd_retval
 cfg_done(__unused struct cmdq_item *item, __unused void *data)  cfg_done(__unused struct cmdq_item *item, __unused void *data)
Line 44 
Line 43 
         if (!RB_EMPTY(&sessions))          if (!RB_EMPTY(&sessions))
                 cfg_show_causes(RB_MIN(sessions, &sessions));                  cfg_show_causes(RB_MIN(sessions, &sessions));
   
         if (cfg_client != NULL)  
                 server_client_unref(cfg_client);  
         return (CMD_RETURN_NORMAL);          return (CMD_RETURN_NORMAL);
 }  }
   
Line 62 
Line 59 
         const char      *home;          const char      *home;
         int              quiet = 0;          int              quiet = 0;
   
         cfg_client = TAILQ_FIRST(&clients);          /*
         if (cfg_client != NULL)           * Note that the configuration files are loaded without a client, so
                 cfg_client->references++;           * NULL is passed into load_cfg() which means that commands run in the
            * global queue and item->client is NULL for all commands.
            */
   
         load_cfg(TMUX_CONF, cfg_client, NULL, 1);          load_cfg(TMUX_CONF, NULL, NULL, 1);
   
         if (cfg_file == NULL && (home = find_home()) != NULL) {          if (cfg_file == NULL && (home = find_home()) != NULL) {
                 xasprintf(&cfg_file, "%s/.tmux.conf", home);                  xasprintf(&cfg_file, "%s/.tmux.conf", home);
                 quiet = 1;                  quiet = 1;
         }          }
         if (cfg_file != NULL)          if (cfg_file != NULL)
                 load_cfg(cfg_file, cfg_client, NULL, quiet);                  load_cfg(cfg_file, NULL, NULL, quiet);
   
         cmdq_append(cfg_client, cmdq_get_callback(cfg_done, NULL));          cmdq_append(NULL, cmdq_get_callback(cfg_done, NULL));
 }  }
   
 int  int

Legend:
Removed from v.1.55  
changed lines
  Added in v.1.56