ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/gvpe.C
(Generate patch)

Comparing gvpe/src/gvpe.C (file contents):
Revision 1.15 by pcg, Fri Nov 21 05:02:08 2008 UTC vs.
Revision 1.17 by pcg, Mon Mar 23 15:22:00 2009 UTC

97 printf (_("Usage: %s [option]... NODENAME\n\n"), get_identity ()); 97 printf (_("Usage: %s [option]... NODENAME\n\n"), get_identity ());
98 printf (_ 98 printf (_
99 (" -c, --config=DIR Read configuration options from DIR.\n" 99 (" -c, --config=DIR Read configuration options from DIR.\n"
100 " -D, --no-detach Don't fork and detach.\n" 100 " -D, --no-detach Don't fork and detach.\n"
101 " -l, --log-level=LEVEL Set logging level (info, notice, warn are common).\n" 101 " -l, --log-level=LEVEL Set logging level (info, notice, warn are common).\n"
102 " -L, --mlock Lock tinc into main memory.\n" 102 " -L, --mlock Lock gvpe into main memory.\n"
103 " --help Display this help and exit.\n" 103 " --help Display this help and exit.\n"
104 " --version Output version information and exit.\n\n")); 104 " --version Output version information and exit.\n\n"));
105 printf (_("Report bugs to <gvpe@schmorp.de>.\n")); 105 printf (_("Report bugs to <gvpe@schmorp.de>.\n"));
106 } 106 }
107 107
235 VERSION, __DATE__, __TIME__, PROTOCOL_MAJOR, PROTOCOL_MINOR); 235 VERSION, __DATE__, __TIME__, PROTOCOL_MAJOR, PROTOCOL_MINOR);
236 printf (_("Built with kernel interface %s/%s.\n"), IFTYPE, IFSUBTYPE); 236 printf (_("Built with kernel interface %s/%s.\n"), IFTYPE, IFSUBTYPE);
237 printf (_ 237 printf (_
238 ("Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de> and others.\n" 238 ("Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de> and others.\n"
239 "See the AUTHORS file for a complete list.\n\n" 239 "See the AUTHORS file for a complete list.\n\n"
240 "tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n" 240 "GVPE comes with ABSOLUTELY NO WARRANTY. This is free software,\n"
241 "and you are welcome to redistribute it under certain conditions;\n" 241 "and you are welcome to redistribute it under certain conditions;\n"
242 "see the file COPYING for details.\n")); 242 "see the file COPYING for details.\n"));
243 243
244 return 0; 244 return 0;
245 } 245 }
293 { 293 {
294 ev_loop (EV_DEFAULT_ 0); 294 ev_loop (EV_DEFAULT_ 0);
295 cleanup_and_exit (EXIT_FAILURE); 295 cleanup_and_exit (EXIT_FAILURE);
296 } 296 }
297 297
298 slog (L_ERR, _("unable to setup network, unrecoverable error, exiting.")); 298 slog (L_ERR, _("unrecoverable error while setting up network, exiting."));
299 cleanup_and_exit (EXIT_FAILURE); 299 cleanup_and_exit (EXIT_FAILURE);
300} 300}
301 301

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines