oxmc/libgtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverted. See #336837

Browse Source 
* configure.in:
	* src/daemon/daemon.h:
	* src/daemon/gnuserv.c: (main):

	Reverted. See #336837
This commit is contained in:
Benoît Dejean
2006-04-02 09:09:41 +00:00
parent ec7922c6bd
commit a7cf016d67
4 changed files with 52 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2006-04-02 Benoît Dejean <benoit@placenet.org>
* configure.in:
* src/daemon/daemon.h:
* src/daemon/gnuserv.c: (main):
Reverted. See #336837
2006-03-18 Vladimer Sichinava <vlsichinava@gmail.com> 2006-03-18 Vladimer Sichinava <vlsichinava@gmail.com>
* configure.in: Added "ka" (Georgian) to ALL_LINGUAS * configure.in: Added "ka" (Georgian) to ALL_LINGUAS

8
configure.in
View File

@@ -109,6 +109,14 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS) AC_SUBST(GLIB_LIBS)
AC_CHECK_HEADER(popt.h,[POPT=yes],[POPT=no])
AC_MSG_CHECKING(for popt.h)
if test x$POPT = xyes ; then
AC_MSG_RESULT(yes)
else
AC_MSG_ERROR([libgtop requires the popt development libraries])
fi
AC_CHECK_HEADER(ifaddrs.h, [HAVE_IFADDRS_H=yes], [HAVE_IFADDRS_H=no]) AC_CHECK_HEADER(ifaddrs.h, [HAVE_IFADDRS_H=yes], [HAVE_IFADDRS_H=no])
if test x$HAVE_IFADDRS_H = xyes ; then if test x$HAVE_IFADDRS_H = xyes ; then
AC_DEFINE(HAVE_IFADDRS_H, 1, [defined if you have ifaddrs.h]) AC_DEFINE(HAVE_IFADDRS_H, 1, [defined if you have ifaddrs.h])

4
src/daemon/daemon.h
View File

@@ -71,8 +71,8 @@ int do_read (int s, void *ptr, size_t total_size) G_GNUC_INTERNAL;
void syslog_message (int priority, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3); void syslog_message (int priority, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3);
void syslog_io_message (int priority, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3); void syslog_io_message (int priority, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3);
extern gboolean enable_debug; extern int enable_debug;
extern gboolean verbose_output; extern int verbose_output;
G_END_DECLS G_END_DECLS

63
src/daemon/gnuserv.c
View File

@@ -46,6 +46,7 @@
#include <glibtop/gnuserv.h> #include <glibtop/gnuserv.h>
#include <errno.h> #include <errno.h>
#include <popt.h>
#include "daemon.h" #include "daemon.h"
@@ -78,10 +79,10 @@ static Xauth *server_xauth = NULL;
#endif /* AUTH_MAGIC_COOKIE */ #endif /* AUTH_MAGIC_COOKIE */
gboolean enable_debug = FALSE; int enable_debug = 0;
gboolean verbose_output = FALSE; int verbose_output = 0;
static gboolean no_daemon = FALSE; static int no_daemon = 0;
static gboolean invoked_from_inetd = FALSE; static int invoked_from_inetd = 0;
static int changed_uid = 0; static int changed_uid = 0;
void void
@@ -453,26 +454,27 @@ handle_signal (int sig)
exit (1); exit (1);
} }
static const GOptionEntry options [] = { const struct poptOption popt_options [] = {
{ "debug", 'd', 0, G_OPTION_ARG_NONE, &enable_debug, POPT_AUTOHELP
N_("Enable debugging"), NULL }, { "debug", 'd', POPT_ARG_NONE, &enable_debug, 0,
{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose_output, N_("Enable debugging"), N_("DEBUG") },
N_("Enable verbose output"), NULL }, { "verbose", 'v', POPT_ARG_NONE, &verbose_output, 0,
{ "no-daemon", 'f', 0, G_OPTION_ARG_NONE, &no_daemon, N_("Enable verbose output"), N_("VERBOSE") },
N_("Don't fork into background"), NULL }, { "no-daemon", 'f', POPT_ARG_NONE, &no_daemon, 0,
{ "inetd", 'i', 0, G_OPTION_ARG_NONE, &invoked_from_inetd, N_("Don't fork into background"), N_("NO-DAEMON") },
N_("Invoked from inetd"), NULL }, { "inetd", 'i', POPT_ARG_NONE, &invoked_from_inetd, 0,
{ NULL } N_("Invoked from inetd"), N_("INETD") },
{ NULL, '\0', 0, NULL, 0, NULL, NULL }
}; };
int int
main (int argc, char **argv) main (int argc, const char **argv)
{ {
const unsigned method = GLIBTOP_METHOD_PIPE; const unsigned method = GLIBTOP_METHOD_PIPE;
const unsigned long features = GLIBTOP_SYSDEPS_ALL; const unsigned long features = GLIBTOP_SYSDEPS_ALL;
glibtop *server = glibtop_global_server; glibtop *server = glibtop_global_server;
GOptionContext *goption_context; poptContext context;
GError *error = NULL; int nextopt;
int ils = -1; /* internet domain listen socket */ int ils = -1; /* internet domain listen socket */
@@ -486,19 +488,22 @@ main (int argc, char **argv)
arg ? (arg + 1) : program_invocation_name; arg ? (arg + 1) : program_invocation_name;
} }
g_set_prgname (program_invocation_short_name); context = poptGetContext ("libgtop-daemon", argc, argv,
goption_context = g_option_context_new (NULL); popt_options, 0);
g_option_context_add_main_entries (goption_context, options, NULL);
g_option_context_parse (goption_context, &argc, &argv, &error);
g_option_context_free (goption_context);
if (error != NULL) { poptReadDefaultConfig (context, TRUE);
g_printerr ("%s\n", error->message);
g_error_free (error); while ((nextopt = poptGetNextOpt (context)) > 0)
g_printerr (_("Run '%s --help' to see a full list of " /* do nothing */ ;
"available command line options.\n"),
program_invocation_name); if(nextopt != -1) {
exit(1); printf (_("Error on option %s: %s.\n"
"Run '%s --help' to see a full list of "
"available command line options.\n"),
poptBadOption (context, 0),
poptStrerror (nextopt),
argv[0]);
exit(1);
} }
if (enable_debug) if (enable_debug)