- Timestamp:
- 2006-01-21T22:31:10Z (19 years ago)
- Branches:
- master
- Children:
- 57c4fc0
- Parents:
- f73b969 (diff), f1d38f2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
conf.c
rf73b969 r54879ab 32 32 #include "ini.h" 33 33 #include "url.h" 34 #include "ipc.h" 34 35 35 36 #include "protocols/proxy.h" … … 77 78 } 78 79 79 while( argc > 0 && ( opt = getopt( argc, argv, "i:p:nvIDFc:d:h " ) ) >= 0 )80 while( argc > 0 && ( opt = getopt( argc, argv, "i:p:nvIDFc:d:hR:" ) ) >= 0 ) 80 81 /* ^^^^ Just to make sure we skip this step from the REHASH handler. */ 81 82 { … … 141 142 " -h Show this help page.\n" ); 142 143 return( NULL ); 144 } 145 else if( opt == 'R' ) 146 { 147 /* We can't load the statefile yet (and should make very sure we do this 148 only once), so set the filename here and load the state information 149 when initializing ForkDaemon. (This option only makes sense in that 150 mode anyway!) */ 151 ipc_master_set_statefile( optarg ); 143 152 } 144 153 }
Note: See TracChangeset
for help on using the changeset viewer.