- Timestamp:
- Jul 8, 2007, 3:37:43 PM (17 years ago)
- Branches:
- master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9
- Children:
- be98ba5
- Parents:
- 93f65b6
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
owl.c
r13a3c1db rb363d83 64 64 owl_global g; 65 65 66 char * owl_get_datadir() { 67 char * datadir = getenv("BARNOWL_DATA_DIR"); 68 if(datadir != NULL) 69 return strchr(datadir, '=') + 1; 70 return DATADIR; 71 } 72 66 73 int main(int argc, char **argv, char **env) 67 74 { … … 73 80 struct sigaction sigact; 74 81 char *configfile, *tty, *perlout, *perlerr, **argvsave, buff[LINE], startupmsg[LINE]; 82 char *confdir; 75 83 owl_filter *f; 76 84 owl_style *s; … … 87 95 argvsave=argv; 88 96 configfile=NULL; 97 confdir = NULL; 89 98 tty=NULL; 90 99 debug=0; … … 101 110 } else if (!strcmp(argv[0], "-c")) { 102 111 if (argc<2) { 103 104 105 112 fprintf(stderr, "Too few arguments to -c\n"); 113 usage(); 114 exit(1); 106 115 } 107 116 configfile=argv[1]; … … 110 119 } else if (!strcmp(argv[0], "-t")) { 111 120 if (argc<2) { 112 113 114 121 fprintf(stderr, "Too few arguments to -t\n"); 122 usage(); 123 exit(1); 115 124 } 116 125 tty=argv[1]; 126 argv+=2; 127 argc-=2; 128 } else if (!strcmp(argv[0], "-s")){ 129 if (argc<2) { 130 fprintf(stderr, "Too few arguments to -s\n"); 131 usage(); 132 exit(1); 133 } 134 confdir = argv[1]; 117 135 argv+=2; 118 136 argc-=2; … … 191 209 /* owl global init */ 192 210 owl_global_init(&g); 193 if (debug) owl_global_set_debug_on(&g); 211 if (debug) owl_global_set_debug_on(&g); 212 if (confdir) owl_global_set_confdir(&g, confdir); 194 213 owl_function_debugmsg("startup: first available debugging message"); 195 214 owl_global_set_startupargs(&g, argcsave, argvsave); … … 213 232 /* create the owl directory, in case it does not exist */ 214 233 owl_function_debugmsg("startup: creating owl directory, if not present"); 215 dir=owl_ sprintf("%s/%s", owl_global_get_homedir(&g), OWL_CONFIG_DIR);234 dir=owl_global_get_confdir(&g); 216 235 mkdir(dir, S_IRWXU); 217 owl_free(dir);218 236 219 237 /* set the tty, either from the command line, or by figuring it out */ … … 697 715 { 698 716 fprintf(stderr, "Owl version %s\n", OWL_VERSION_STRING); 699 fprintf(stderr, "Usage: owl [-n] [-d] [-D] [-v] [-h] [-c <configfile>] [- t <ttyname>]\n");717 fprintf(stderr, "Usage: owl [-n] [-d] [-D] [-v] [-h] [-c <configfile>] [-s <confdir>] [-t <ttyname>]\n"); 700 718 fprintf(stderr, " -n don't load zephyr subscriptions\n"); 701 719 fprintf(stderr, " -d enable debugging\n"); … … 704 722 fprintf(stderr, " -h print this help message\n"); 705 723 fprintf(stderr, " -c specify an alternate config file\n"); 724 fprintf(stderr, " -s specify an alternate config dir (default ~/.owl)\n"); 706 725 fprintf(stderr, " -t set the tty name\n"); 707 726 }
Note: See TracChangeset
for help on using the changeset viewer.