From 93939893de95a8419ba067b358c951b036d78cc7 Mon Sep 17 00:00:00 2001 From: Jay Sorg Date: Mon, 13 Feb 2012 23:31:11 -0800 Subject: [PATCH] remove old freerdp dir --- Makefile.am | 4 ---- configure.ac | 6 ------ sesman/sesman.c | 12 +++++++++++- xrdp/xrdp.c | 9 +++++++++ 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5b1d7c42..613c2471 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,14 +1,10 @@ EXTRA_DIST = bootstrap COPYING design.txt faq-compile.txt faq-general.txt file-loc.txt install.txt prog_std.txt readme.txt -if XRDP_FREERDP -FREERDPDIR = freerdp -else if XRDP_FREERDP1 FREERDPDIR = freerdp1 else FREERDPDIR = endif -endif SUBDIRS = \ common \ diff --git a/configure.ac b/configure.ac index 3dc956eb..5330143e 100644 --- a/configure.ac +++ b/configure.ac @@ -23,10 +23,6 @@ AC_ARG_ENABLE(xrdpdebug, AS_HELP_STRING([--enable-xrdpdebug], [Build debug (default: no)]), [xrdpdebug=true], [xrdpdebug=false]) AM_CONDITIONAL(XRDP_DEBUG, [test x$xrdpdebug = xtrue]) -AC_ARG_ENABLE(freerdp, AS_HELP_STRING([--enable-freerdp], - [Build freerdp module (default: no)]), - [freerdp=true], [freerdp=false]) -AM_CONDITIONAL(XRDP_FREERDP, [test x$freerdp = xtrue]) AC_ARG_ENABLE(freerdp1, AS_HELP_STRING([--enable-freerdp1], [Build freerdp1 module (default: no)]), [freerdp1=true], [freerdp1=false]) @@ -47,7 +43,6 @@ then fi fi -AS_IF( [test "x$enable_freerdp" = "xyes"] , [PKG_CHECK_MODULES(FREERDP, freerdp >= 0.8.1)] ) AS_IF( [test "x$enable_freerdp1" = "xyes"] , [PKG_CHECK_MODULES(FREERDP, freerdp >= 1.0.0)] ) # checking for Xlib, Xfixes @@ -69,7 +64,6 @@ AC_CONFIG_FILES([Makefile libxrdp/Makefile xup/Makefile mc/Makefile - freerdp/Makefile freerdp1/Makefile xrdp/Makefile sesman/Makefile diff --git a/sesman/sesman.c b/sesman/sesman.c index 7bf794e1..5a230417 100644 --- a/sesman/sesman.c +++ b/sesman/sesman.c @@ -167,6 +167,7 @@ main(int argc, char** argv) g_printf("-k, --kill kills running sesman\n"); g_printf("-h, --help shows this help\n"); g_printf("if no command is specified, sesman is started in background"); + g_deinit(); g_exit(0); } else if ((2 == argc) && ((0 == g_strcasecmp(argv[1], "--kill")) || @@ -178,6 +179,7 @@ main(int argc, char** argv) if (!g_file_exist(pid_file)) { g_printf("sesman is not running (pid file not found - %s)\n", pid_file); + g_deinit(); g_exit(1); } @@ -194,6 +196,7 @@ main(int argc, char** argv) { g_printf("error reading pid file: %s\n", g_get_strerror()); g_file_close(fd); + g_deinit(); g_exit(error); } g_file_close(fd); @@ -208,7 +211,7 @@ main(int argc, char** argv) { g_file_delete(pid_file); } - + g_deinit(); g_exit(error); } else @@ -217,6 +220,7 @@ main(int argc, char** argv) g_printf("sesman - xrdp session manager\n\n"); g_printf("error: invalid command line\n"); g_printf("usage: sesman [ --nodaemon | --kill | --help ]\n"); + g_deinit(); g_exit(1); } @@ -226,6 +230,7 @@ main(int argc, char** argv) g_printf("if it's not running, try removing "); g_printf(pid_file); g_printf("\n"); + g_deinit(); g_exit(1); } @@ -234,12 +239,14 @@ main(int argc, char** argv) if (0 == g_cfg) { g_printf("error creating config: quitting.\n"); + g_deinit(); g_exit(1); } g_cfg->log.fd = -1; /* don't use logging before reading its config */ if (0 != config_read(g_cfg)) { g_printf("error reading config: %s\nquitting.\n", g_get_strerror()); + g_deinit(); g_exit(1); } @@ -257,6 +264,7 @@ main(int argc, char** argv) g_printf("error opening log file [%s]. quitting.\n", g_cfg->log.log_file); break; } + g_deinit(); g_exit(1); } @@ -270,6 +278,7 @@ main(int argc, char** argv) if (0 != g_pid) { + g_deinit(); g_exit(0); } @@ -312,6 +321,7 @@ main(int argc, char** argv) "error opening pid file[%s]: %s", pid_file, g_get_strerror()); log_end(&(g_cfg->log)); + g_deinit(); g_exit(1); } g_sprintf(pid_s, "%d", g_pid); diff --git a/xrdp/xrdp.c b/xrdp/xrdp.c index bbe6c6a8..fb8dfbc0 100644 --- a/xrdp/xrdp.c +++ b/xrdp/xrdp.c @@ -279,6 +279,7 @@ main(int argc, char** argv) g_writeln("Unknown Parameter"); g_writeln("xrdp -h for help"); g_writeln(""); + g_deinit(); g_exit(0); } @@ -311,6 +312,7 @@ main(int argc, char** argv) } g_file_close(fd); } + g_deinit(); g_exit(0); } if (startup_params->no_daemon) @@ -329,6 +331,7 @@ main(int argc, char** argv) g_writeln(" -nodaemon: don't fork into background"); g_writeln(" -kill: shut down xrdp"); g_writeln(""); + g_deinit(); g_exit(0); } if (startup_params->version) @@ -339,12 +342,14 @@ main(int argc, char** argv) g_writeln("See http://xrdp.sourceforge.net for more information."); g_writeln("Version %s",PACKAGE_VERSION); g_writeln(""); + g_deinit(); g_exit(0); } if (g_file_exist(pid_file)) /* xrdp.pid */ { g_writeln("It looks like xrdp is allready running,"); g_writeln("if not delete the xrdp.pid file and try again"); + g_deinit(); g_exit(0); } if (!no_daemon) @@ -354,11 +359,13 @@ main(int argc, char** argv) if (fd == -1) { g_writeln("running in daemon mode with no access to pid files, quitting"); + g_deinit(); g_exit(0); } if (g_file_write(fd, "0", 1) == -1) { g_writeln("running in daemon mode with no access to pid files, quitting"); + g_deinit(); g_exit(0); } g_file_close(fd); @@ -371,12 +378,14 @@ main(int argc, char** argv) if (pid == -1) { g_writeln("problem forking"); + g_deinit(); g_exit(1); } if (0 != pid) { g_writeln("process %d started ok", pid); /* exit, this is the main process */ + g_deinit(); g_exit(0); } g_sleep(1000);