Upstream/mbusd
1
0
Fork 0
mirror of https://github.com/3cky/mbusd.git synced 2024-12-26 16:57:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added handling '-' value for '-L' switch

Browse Source
This commit is contained in:
kapyar 2003-10-26 19:22:18 +00:00
parent e70c70f25a
commit ed2e49c9dc
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main.c
View File

@ -28,7 +28,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: main.c,v 1.3 2003/10/10 20:40:53 kapyar Exp $ * $Id: main.c,v 1.4 2003/10/26 19:22:18 kapyar Exp $
*/ */
#include "globals.h" #include "globals.h"
@ -110,7 +110,9 @@ usage(char *exename)
#else #else
" -v<level> set log level (0-2, default %d, 0 - errors only)\n" " -v<level> set log level (0-2, default %d, 0 - errors only)\n"
#endif #endif
" -L<name> set log file name (default %s%s)\n" " -L<name> set log file name (default %s%s, \n"
" value '-' forces log data output to STDOUT only\n"
" if '-d' switch was given)\n"
#endif #endif
" -p<name> set serial port device name (default %s)\n" " -p<name> set serial port device name (default %s)\n"
" -s<value> set serial port speed (default %d)\n" " -s<value> set serial port speed (default %d)\n"
@ -177,27 +179,41 @@ main(int argc, char *argv[])
#ifdef LOG #ifdef LOG
case 'v': case 'v':
cfg.dbglvl = (char)strtol(optarg, NULL, 0); cfg.dbglvl = (char)strtol(optarg, NULL, 0);
#ifdef DEBUG # ifdef DEBUG
if (cfg.dbglvl < 0 || cfg.dbglvl > 9) if (cfg.dbglvl < 0 || cfg.dbglvl > 9)
{ /* report about invalid log level */ { /* report about invalid log level */
printf("%s: -v: invalid loglevel value" printf("%s: -v: invalid loglevel value"
" (%d, must be 0-9)\n", exename, cfg.dbglvl); " (%d, must be 0-9)\n", exename, cfg.dbglvl);
#else # else
if (cfg.dbglvl < 0 || cfg.dbglvl > 9) if (cfg.dbglvl < 0 || cfg.dbglvl > 9)
{ /* report about invalid log level */ { /* report about invalid log level */
printf("%s: -v: invalid loglevel value" printf("%s: -v: invalid loglevel value"
" (%d, must be 0-2)\n", exename, cfg.dbglvl); " (%d, must be 0-2)\n", exename, cfg.dbglvl);
#endif # endif
exit(-1); exit(-1);
} }
break; break;
case 'L': case 'L':
if (*optarg != '/') if (*optarg != '/')
{
if (*optarg == '-')
{
if (isdaemon)
{
printf("%s: -L: '-' value is valid only if "
"-d switch was given\n", exename);
exit(-1);
}
/* logfile isn't needed, doing all output to STDOUT */
*cfg.logname = '\0';
}
else
{ /* concatenate given log file name with default path */ { /* concatenate given log file name with default path */
strncpy(cfg.logname, LOGPATH, INTBUFSIZE); strncpy(cfg.logname, LOGPATH, INTBUFSIZE);
strncat(cfg.logname, optarg, strncat(cfg.logname, optarg,
INTBUFSIZE - strlen(cfg.logname)); INTBUFSIZE - strlen(cfg.logname));
} }
}
else strncpy(cfg.logname, optarg, INTBUFSIZE); else strncpy(cfg.logname, optarg, INTBUFSIZE);
break; break;
#endif #endif