embedaddon/mpd/src/main.c - diff

Return to main.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / mpd / src

Diff for /embedaddon/mpd/src/main.c between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2013/07/22 08:44:29	version 1.1.1.3, 2016/11/01 09:56:12
Line 26	Line 26
#include "ccp_mppc.h"	#include "ccp_mppc.h"
#endif	#endif

	#ifdef USE_BACKTRACE
	#include <execinfo.h>
	#endif
#include <netgraph.h>	#include <netgraph.h>

/*	/*
Line 47	Line 50
};	};
typedef struct option *Option;	typedef struct option *Option;

static const char *UsageStr = "[options] [system]";	static const char *UsageStr = "[options] [configuration]";
static struct option OptList[] = {	static struct option OptList[] = {
{ 0, 'b', "background", "",	{ 0, 'b', "background", "",
"Run as a background daemon" },	"Run as a background daemon" },
Line 173 main(int ac, char *av[])	Line 176 main(int ac, char *av[])
Context c;	Context c;
PhysType pt;	PhysType pt;

gPid=getpid();	gPid = getpid();

/* enable libpdel typed_mem */	/* enable libpdel typed_mem */
typed_mem_enable();	typed_mem_enable();
Line 265 main(int ac, char *av[])	Line 268 main(int ac, char *av[])
}	}

/* Create signaling pipe */	/* Create signaling pipe */
if ((ret = pipe(gSignalPipe)) != 0) {	if (pipe(gSignalPipe) < 0) {
Log(LG_ERR, ("Could not create signal pipe %d", ret));	Perror("Could not create signal pipe");
exit(EX_UNAVAILABLE);	exit(EX_UNAVAILABLE);
}	}
if (EventRegister(&gSignalEvent, EVENT_READ, gSignalPipe[0],	if (EventRegister(&gSignalEvent, EVENT_READ, gSignalPipe[0],
Line 320 static void	Line 323 static void
ConfigRead(int type, void *arg)	ConfigRead(int type, void *arg)
{	{
Context c = (Context)arg;	Context c = (Context)arg;
	int err;

/* Read startup configuration section */	/* Read startup configuration section */
ReadFile(gConfigFile, STARTUP_CONF, DoCommand, c);	err = ReadFile(gConfigFile, STARTUP_CONF, DoCommand, c);

/* Read configuration as specified on the command line, or default */	/* Read configuration as specified on the command line, or default */
if (!gPeerSystem)	if (!gPeerSystem) {
ReadFile(gConfigFile, DEFAULT_CONF, DoCommand, c);	if (err != -2)
else {	ReadFile(gConfigFile, DEFAULT_CONF, DoCommand, c);
if (ReadFile(gConfigFile, gPeerSystem, DoCommand, c) < 0) {	} else {
	if (err == -2 \|\| ReadFile(gConfigFile, gPeerSystem, DoCommand, c) < 0) {
Log(LG_ERR, ("can't read configuration for \"%s\"", gPeerSystem));	Log(LG_ERR, ("can't read configuration for \"%s\"", gPeerSystem));
DoExit(EX_CONFIG);	DoExit(EX_CONFIG);
}	}
Line 469 FatalSignal(int sig)	Line 474 FatalSignal(int sig)
static struct pppTimer gDeathTimer;	static struct pppTimer gDeathTimer;
int k;	int k;
int upLinkCount;	int upLinkCount;
	#ifdef USE_BACKTRACE
	void *buffer[100];
	char **strings;
	int n;
	#endif

/* If a SIGTERM or SIGINT, gracefully shutdown; otherwise shutdown now */	/* If a SIGTERM or SIGINT, gracefully shutdown; otherwise shutdown now */
Log(LG_ERR, ("caught fatal signal %s", sys_signame[sig]));	Log(LG_ERR, ("caught fatal signal %s", sys_signame[sig]));
gShutdownInProgress=1;	gShutdownInProgress=1;
	#ifdef USE_BACKTRACE
	if (sig != SIGTERM && sig != SIGINT) {
	n = backtrace(buffer, 100);
	strings = backtrace_symbols(buffer, n);
	if (strings == NULL) {
	Log(LG_ERR, ("No backtrace symbols found"));
	} else {
	for (k = 0; k < n; k++) {
	Log(LG_ERR, ("%s", strings[k]));
	}
	free(strings);
	}
	}
	#endif
for (k = 0; k < gNumBundles; k++) {	for (k = 0; k < gNumBundles; k++) {
if ((b = gBundles[k])) {	if ((b = gBundles[k])) {
if (sig != SIGTERM && sig != SIGINT)	if (sig != SIGTERM && sig != SIGINT)
Line 688 Usage(int ex)	Line 712 Usage(int ex)
opt = OptList + k;	opt = OptList + k;
snprintf(buf, sizeof(buf), " -%c, --%-s %s",	snprintf(buf, sizeof(buf), " -%c, --%-s %s",
opt->sflag, opt->lflag, opt->usage);	opt->sflag, opt->lflag, opt->usage);
fprintf(stderr, "%-40s%s\n", buf, opt->desc);	fprintf(stderr, "%-35s%s\n", buf, opt->desc);
}	}
exit(ex);	exit(ex);
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.1.2
changed lines
	Added in v.1.1.1.3