Changeset ced25d1
- Timestamp:
- Feb 21, 2003, 10:31:16 AM (21 years ago)
- Branches:
- master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9
- Children:
- 2c8d62e
- Parents:
- 060b3b4
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
ChangeLog
r060b3b4 rced25d1 19 19 'none' filter defined as 'false' 20 20 Fixed bug in 'unsub' command that could cause file corruption 21 In the zlist function, give a more detailed error message if 22 the file cannot be opened. 23 Renamed old instances of zsig_exec in the code to zsigproc 24 Don't print the stderr from zsigproc 21 25 22 26 1.2.8 -
functions.c
r060b3b4 rced25d1 2454 2454 f=fopen(ourfile, "r"); 2455 2455 if (!f) { 2456 owl_function_makemsg("Error opening file %s", ourfile); 2456 owl_function_makemsg("Error opening file %s: %s", 2457 ourfile, 2458 strerror(errno) ? strerror(errno) : ""); 2457 2459 return; 2458 2460 } -
owl.c
r89426ab rced25d1 30 30 owl_editwin *tw; 31 31 owl_popwin *pw; 32 int j, ret, initialsubs, debug, newzephyrs, argcsave, followlast, nexttimediff; 32 int j, ret, initialsubs, debug, argcsave, followlast; 33 int newzephyrs, zpendcount, nexttimediff; 33 34 struct sigaction sigact; 34 35 char *configfile, *tty, *perlout, **argvsave, buff[LINE], startupmsg[LINE]; … … 127 128 owl_context_set_readconfig(owl_global_get_context(&g)); 128 129 130 /* set the tty, either from the command line, or by figuring it out */ 129 131 if (tty) { 130 132 owl_global_set_tty(&g, tty); … … 180 182 exit(1); 181 183 } 184 185 /* execute the startup function in the configfile */ 182 186 perlout = owl_config_execute("owl::startup();"); 183 187 if (perlout) owl_free(perlout); … … 220 224 strcat(startupmsg, "Please report any bugs or suggestions to bug-owl@mit.edu ( ) \n"); 221 225 strcat(startupmsg, "-------------------------------------------------------------------m-m---\n"); 222 223 226 owl_function_adminmsg("", startupmsg); 224 227 sepbar(NULL); … … 260 263 /* grab incoming zephyrs */ 261 264 newzephyrs=0; 265 zpendcount=0; 262 266 while(ZPending()) { 263 267 ZNotice_t notice; … … 265 269 owl_message *m; 266 270 271 /* grab a notice, but if we've done 20 without stopping, take 272 a break to process keystrokes etc. */ 273 if (zpendcount>20) break; 267 274 ZReceiveNotice(¬ice, &from); 275 zpendcount++; 268 276 269 277 /* is this an ack from a zephyr we sent? */ … … 330 338 } 331 339 332 /* check if newmsgproc is active, if not but the option is on, 333 make it active */ 340 /* do the newmsgproc thing */ 334 341 if (newzephyrs) { 335 342 owl_function_do_newmsgproc(); … … 337 344 338 345 /* redisplay if necessary */ 346 /* maybe this should be optimized to not even run if 347 the zephyr won't be displayed */ 339 348 if (newzephyrs) { 340 349 owl_mainwin_redisplay(owl_global_get_mainwin(&g)); -
variable.c
r7e3e00a rced25d1 150 150 "This file will be logged to if 'debug' is set to 'on'.\n"), 151 151 152 OWLVAR_PATH( "zsigproc" /* %OwlVarStub:zsig _exec */, NULL,152 OWLVAR_PATH( "zsigproc" /* %OwlVarStub:zsigproc */, NULL, 153 153 "name of a program to run that will generate zsigs", 154 154 "This program should produce a zsig on stdout when run.\n" -
zwrite.c
re3869df rced25d1 22 22 int argc, badargs, myargc; 23 23 char **argv, **myargv; 24 char *zsig exec, *zsigowlvar, *zsigzvar, *ptr;24 char *zsigproc, *zsigowlvar, *zsigzvar, *ptr; 25 25 struct passwd *pw; 26 26 … … 112 112 113 113 /* set a zsig */ 114 zsig exec = owl_global_get_zsig_exec(&g);114 zsigproc = owl_global_get_zsigproc(&g); 115 115 zsigowlvar = owl_global_get_zsig(&g); 116 116 zsigzvar = ZGetVariable("zwrite-signature"); … … 119 119 owl_free(z->zsig); 120 120 z->zsig=strdup(zsigowlvar); 121 } else if (zsig exec && *zsigexec) {121 } else if (zsigproc && *zsigproc) { 122 122 FILE *file; 123 char buff[LINE]; 124 125 file=popen(zsigexec, "r"); 123 char buff[LINE], *openline; 124 125 /* simple hack for now to nuke stderr */ 126 openline=owl_malloc(strlen(zsigproc)+40); 127 strcpy(openline, zsigproc); 128 strcat(openline, " 2> /dev/null"); 129 file=popen(openline, "r"); 130 owl_free(openline); 126 131 if (!file) { 127 132 if (zsigzvar && *zsigzvar) {
Note: See TracChangeset
for help on using the changeset viewer.