Changes in global.c [ad15610:34509d5]

File:

• global.c (modified) (4 diffs)

global.c

@@ -18 +18 @@
   struct hostent *hent;
   char hostname[MAXHOSTNAMELEN];
-  char *cd;
 
   g->malloced=0;
@@ -87 +86 @@
   g->homedir=owl_strdup(getenv("HOME"));
 
-  g->confdir = NULL;
-  g->startupfile = NULL;
-  cd = owl_sprintf("%s/%s", g->homedir, OWL_CONFIG_DIR);
-  owl_global_set_confdir(g, cd);
-  owl_free(cd);
-
   owl_messagelist_create(&(g->msglist));
   owl_mainwin_init(&(g->mw));
@@ -326 +319 @@
 }
 
-char *owl_global_get_confdir(owl_global *g) {
-  if (g->confdir) return(g->confdir);
-  return("/");
-}
-
-/*
- * Setting this also sets startupfile to confdir/startup
- */
-void owl_global_set_confdir(owl_global *g, char *cd) {
-  free(g->confdir);
-  g->confdir = owl_strdup(cd);
-  free(g->startupfile);
-  g->startupfile = owl_sprintf("%s/startup", cd);
-}
-
-char *owl_global_get_startupfile(owl_global *g) {
-  if(g->startupfile) return(g->startupfile);
-  return("/");
-}
-
 int owl_global_get_direction(owl_global *g) {
   return(g->direction);
@@ -545 +518 @@
     len+=strlen(argv[i])+5;
   }
-  g->startupargs=malloc(len+5);
+  g->startupargs=owl_malloc(len+5);
 
   strcpy(g->startupargs, "");