Merge lp:~linuxjedi/libdrizzle/5.1-remove-glib into lp:libdrizzle

[Andrew Hutchings]

=== modified file 'cli/drizzle_binlogs.c'
--- cli/drizzle_binlogs.c	2012-12-26 08:26:59 +0000
+++ cli/drizzle_binlogs.c	2012-12-28 21:28:24 +0000
@@ -38,47 +38,110 @@
 #include <libdrizzle-5.1/libdrizzle.h>
 #include <stdlib.h>
 #include <sys/types.h>
-#include <glib.h>
-#include <glib/gstdio.h>
 #include <pwd.h>
 #include <unistd.h>
 #include <errno.h>
+#include <argp.h>
+#include <time.h>
 
 #define STR_HELPER(x) #x
 #define STR(x) STR_HELPER(x)
 
-gchar *host= NULL;
-gint port= DRIZZLE_DEFAULT_TCP_PORT;
-gchar *user= NULL;
-gboolean user_alloced= FALSE;
-gchar *pass= NULL;
-gchar *outdir= NULL;
-gchar *start_file= NULL;
-gint start_pos= 0;
-gboolean continuous= FALSE;
-
-static GOptionEntry main_options[]= {
-  { "host", 0, 0, G_OPTION_ARG_STRING, &host, "Hostname of server, default "DRIZZLE_DEFAULT_TCP_HOST, NULL },
-  { "port", 0, 0, G_OPTION_ARG_INT, &port, "Port number of server, default "STR(DRIZZLE_DEFAULT_TCP_PORT), NULL },
-  { "user", 0, 0, G_OPTION_ARG_STRING, &user, "Username for the server, default is current system user", NULL },
-  { "pass", 0, 0, G_OPTION_ARG_STRING, &pass, "Password for the server", NULL },
-  { "outdir", 0, 0, G_OPTION_ARG_FILENAME, &outdir, "Output directory", NULL },
-  { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL }
-};
-
-static GOptionEntry binlog_options[]= {
-  { "start-file", 0, 0, G_OPTION_ARG_FILENAME, &start_file, "Binlog file to start with", NULL },
-  { "start-pos", 0, 0, G_OPTION_ARG_INT, &start_pos, "Position to start with", NULL },
-  { "continuous", 0, 0, G_OPTION_ARG_NONE, &continuous, "Continous download mode", NULL }
-};
-
-gboolean get_system_user(char *dest, uint8_t len);
+char *host= NULL;
+uint16_t port= DRIZZLE_DEFAULT_TCP_PORT;
+char *user= NULL;
+bool user_alloced= false;
+char *pass= NULL;
+char *outdir= NULL;
+char *start_file= NULL;
+uint32_t start_pos= 0;
+bool continuous= false;
+uint8_t opt_count= 0;
+
+typedef enum
+{
+  OPT_NONE,
+  OPT_HOST,
+  OPT_PORT,
+  OPT_USER,
+  OPT_PASS,
+  OPT_OUTDIR,
+  OPT_FILE,
+  OPT_START_POS,
+  OPT_CONTINUOUS
+} option_consts_t;
+
+static struct argp_option options[]= {
+  { "host", OPT_HOST, "HOST", 0, "Hostname of server, default "DRIZZLE_DEFAULT_TCP_HOST, 0 },
+  { "port", OPT_PORT, "PORT", 0, "Port number of server, default "STR(DRIZZLE_DEFAULT_TCP_PORT), 0 },
+  { "user", OPT_USER, "USER", 0, "Username for the server, default is current system user", 0 },
+  { "pass", OPT_PASS, "PASS", 0, "Password for the server", 0 },
+  { "outdir", OPT_OUTDIR, "OUTDIR", 0, "Output directory", 0 },
+  { 0, 0, 0, 0, "Binlog Options", 1 },
+  { "start-file", OPT_FILE, "FILENAME", 0, "Binlog file to start with", 1 },
+  { "start-pos", OPT_START_POS, "POS", 0, "Position to start with", 1 },
+  { "continuous", OPT_CONTINUOUS, 0, 0, "Continous download mode", 1 },
+  { 0 }
+};
+
+static char doc[]= "Drizzle binlog retriever";
+static char args_doc[]= "";
+const char *argp_program_version= LIBDRIZZLE_VERSION_STRING;
+static error_t parse_opt(int key, char *arg, struct argp_state *state)
+{
+  (void)(state);
+  switch(key)
+  {
+    case OPT_HOST:
+      host= arg;
+      opt_count++;
+      break;
+    case OPT_PORT:
+      port= atoi(arg);
+      opt_count++;
+      break;
+    case OPT_USER:
+      user= arg;
+      opt_count++;
+      break;
+    case OPT_PASS:
+      pass= arg;
+      opt_count++;
+      break;
+    case OPT_OUTDIR:
+      outdir= arg;
+      opt_count++;
+      break;
+    case OPT_FILE:
+      start_file= arg;
+      opt_count++;
+      break;
+    case OPT_START_POS:
+      start_pos= atoi(arg);
+      opt_count++;
+      break;
+    case OPT_CONTINUOUS:
+      continuous= true;
+      opt_count++;
+      break;
+    case ARGP_KEY_NO_ARGS:
+      break;
+    default:
+      return ARGP_ERR_UNKNOWN;
+      break;
+  }
+  return 0;
+}
+
+static struct argp argp = { options, parse_opt, args_doc, doc, NULL, NULL, NULL };
+
+bool get_system_user(char *dest, uint8_t len);
 drizzle_st *_connect(void);
 FILE *create_binlog_file(char *binlog_file);
 void get_binlogs(drizzle_st *con);
 void write_binlog(FILE* file, const uint8_t* data, uint32_t len);
 
-gboolean get_system_user(char *dest, uint8_t len)
+bool get_system_user(char *dest, uint8_t len)
 {
   long pw_len= sysconf(_SC_GETPW_R_SIZE_MAX);
   struct passwd pw_struct;
@@ -87,16 +150,16 @@
   {
     pw_len= 1024;
   }
-  char *pw_buffer= g_malloc(pw_len);
+  char *pw_buffer= malloc(pw_len);
 
   if (getpwuid_r(geteuid(), &pw_struct, pw_buffer, pw_len, &pw_tmp_struct) == 0)
   {
-    g_strlcpy(dest, pw_struct.pw_name, len);
-    g_free(pw_buffer);
-    return TRUE;
+    strncpy(dest, pw_struct.pw_name, len);
+    free(pw_buffer);
+    return true;
   }
-  g_free(pw_buffer);
-  return FALSE;
+  free(pw_buffer);
+  return false;
 }
 
 drizzle_st *_connect(void)
@@ -107,13 +170,13 @@
   con= drizzle_create_tcp(host, port, user, pass, "", 0);
   if (!con)
   {
-    g_print("Drizzle connection object creation error\n");
+    printf("Drizzle connection object creation error\n");
     return NULL;
   }
   ret= drizzle_connect(con);
   if (ret != DRIZZLE_RETURN_OK)
   {
-    g_print("Error connecting to server: %s\n", drizzle_error(con));
+    printf("Error connecting to server: %s\n", drizzle_error(con));
     return NULL;
   }
   return con;
@@ -122,20 +185,17 @@
 FILE *create_binlog_file(char *binlog_file)
 {
   FILE *outfile;
-  char *filename;
+  char filename[PATH_MAX];
   if (outdir)
   {
-    filename= g_strdup_printf("%s/%s", outdir, binlog_file);
+    snprintf(filename, PATH_MAX, "%s/%s", outdir, binlog_file);
+    outfile= fopen(filename, "w");
   }
   else
   {
-    filename= binlog_file;
-  }
-  outfile= g_fopen(filename, "w");
-  if (outdir)
-  {
-    g_free(filename);
-  }
+    outfile= fopen(binlog_file, "w");
+  }
+
   return outfile;
 }
 
@@ -143,15 +203,17 @@
 {
   drizzle_result_st *result;
   drizzle_return_t ret;
-  int server_id;
+  uint16_t server_id;
   FILE *outfile;
-  gchar *binlog_file;
+  char binlog_file[PATH_MAX];
   uint32_t event_len;
-  gboolean read_end= FALSE;
+  bool read_end= false;
 
   if (continuous)
   {
-    server_id= g_random_int_range(32768, 65535);
+    srand(time(NULL));
+    // Random server ID from range 32767 - 65535
+    server_id= rand() % 32768 + 32767;
   }
   else
   {
@@ -161,15 +223,15 @@
   result= drizzle_start_binlog(con, server_id, start_file, start_pos, &ret);
   if (ret != DRIZZLE_RETURN_OK)
   {
-    g_print("Drizzle binlog start failure: %s\n", drizzle_error(con));
+    printf("Drizzle binlog start failure: %s\n", drizzle_error(con));
     exit(EXIT_FAILURE);
   }
 
-  binlog_file= g_strdup(start_file);
+  snprintf(binlog_file, PATH_MAX, "%s", start_file);
   outfile= create_binlog_file(binlog_file);
   if (!outfile)
   {
-    g_print("Could not create binlog file '%s', errno %d\n", binlog_file, errno);
+    printf("Could not create binlog file '%s', errno %d\n", binlog_file, errno);
     exit(EXIT_FAILURE);
   }
 
@@ -185,20 +247,19 @@
           // EOF
           if (ret != DRIZZLE_RETURN_EOF)
           {
-            g_print("Read error: %d - %s\n", ret, drizzle_error(con));
+            printf("Read error: %d - %s\n", ret, drizzle_error(con));
           }
-          read_end= TRUE;
+          read_end= true;
           break;
       }
       if (drizzle_binlog_event_type(result) == DRIZZLE_EVENT_TYPE_ROTATE)
       {
         fclose(outfile);
-        g_free(binlog_file);
-        binlog_file= g_strndup((const gchar *)drizzle_binlog_event_data(result), drizzle_binlog_event_length(result));
+        snprintf(binlog_file, PATH_MAX, "%.*s", drizzle_binlog_event_length(result), drizzle_binlog_event_data(result));
         outfile= create_binlog_file(binlog_file);
         if (!outfile)
         {
-          g_print("Could not create binlog file '%s', errno %d\n", binlog_file, errno);
+          printf("Could not create binlog file '%s', errno %d\n", binlog_file, errno);
           exit(EXIT_FAILURE);
         }
         break;
@@ -220,7 +281,7 @@
   {
     if (write(fileno(file), data, len) <= 0)
     {
-      g_print("Error: binlog: Error writing binary log: %s", strerror(errno));
+      printf("Error: binlog: Error writing binary log: %s", strerror(errno));
       exit(EXIT_FAILURE);
     }
   }
@@ -229,21 +290,13 @@
 
 int main(int argc, char *argv[])
 {
-  GError *error= NULL;
-  GOptionContext *context;
   drizzle_st *con;
   char sysuser[DRIZZLE_MAX_USER_SIZE];
 
-  context= g_option_context_new(" - Drizzle binlog retriever");
-  GOptionGroup *main_group= g_option_group_new("main", "Main Options", "Main Options", NULL, NULL);
-  GOptionGroup *binlog_group= g_option_group_new("binlog", "Binlog Options", "Binlog Options", NULL, NULL);
-  g_option_group_add_entries(main_group, main_options);
-  g_option_group_add_entries(binlog_group, binlog_options);
-  g_option_context_set_main_group(context, main_group);
-  g_option_context_add_group(context, binlog_group);
-  if (!g_option_context_parse(context, &argc, &argv, &error))
+  argp_parse(&argp, argc, argv, 0, 0, NULL);
+  if (opt_count == 0)
   {
-    g_print("Error parsing options: %s, try --help\n", error->message);
+    argp_help(&argp, stdout, ARGP_HELP_STD_USAGE, program_invocation_short_name);
     return EXIT_FAILURE;
   }
   if (!user)
@@ -251,13 +304,13 @@
     user= sysuser;
     if (!get_system_user(user, DRIZZLE_MAX_USER_SIZE))
     {
-      g_print("No user specified and could not determine current user\n");
+      printf("No user specified and could not determine current user\n");
       return EXIT_FAILURE;
     }
   }
   if (!host)
   {
-    host= g_strdup(DRIZZLE_DEFAULT_TCP_HOST);
+    host= (char*)DRIZZLE_DEFAULT_TCP_HOST;
   }
   if (!port)
   {
@@ -265,7 +318,7 @@
   }
   if (!start_file)
   {
-    g_print("Binlog start file required\n");
+    printf("Binlog start file required\n");
     return EXIT_FAILURE;
   }
   con = _connect();
@@ -275,6 +328,5 @@
   }
   get_binlogs(con);
   drizzle_quit(con);
-  g_option_context_free(context);
   return EXIT_SUCCESS;
 }

=== modified file 'cli/include.am'
--- cli/include.am	2012-12-27 19:47:01 +0000
+++ cli/include.am	2012-12-28 21:28:24 +0000
@@ -2,16 +2,10 @@
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
 
-if HAVE_GLIB
-
 bin_PROGRAMS+= cli/drizzle_binlogs
 cli_drizzle_binlogs_SOURCES= cli/drizzle_binlogs.c
 cli_drizzle_binlogs_LDADD= libdrizzle/libdrizzle.la
-cli_drizzle_binlogs_LDADD+= @GLIB_LIBS@
-cli_drizzle_binlogs_CFLAGS= @GLIB_CFLAGS@
-cli_drizzle_binlogs_CXXFLAGS= @GLIB_CFLAGS@
 
 check_SCRIPTS+= cli/drizzle_binlogs_check.sh
 EXTRA_DIST+= ${check_SCRIPTS}
 
-endif

=== modified file 'configure.ac'
--- configure.ac	2012-12-27 11:36:56 +0000
+++ configure.ac	2012-12-28 21:28:24 +0000
@@ -59,9 +59,6 @@
 # Checks for libraries.
 AX_CXX_GCC_ABI_DEMANGLE
 AX_CHECK_OPENSSL
-AM_PATH_GLIB_2_0(,[HAVE_GLIB=false],[HAVE_GLIB=true])
-
-AM_CONDITIONAL([HAVE_GLIB],[test "x$HAVE_GLIB"="xtrue"])
 
 # Checks for header files.
 AC_DEFUN([CHECK_FOR_CXXABI],

=== removed file 'm4/glib-2.0.m4'
--- m4/glib-2.0.m4	2012-12-17 21:04:59 +0000
+++ m4/glib-2.0.m4	1970-01-01 00:00:00 +0000
@@ -1,214 +0,0 @@
-# Configure paths for GLIB
-# Owen Taylor     1997-2001
-
-dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
-dnl gthread, or gio is specified in MODULES, pass to pkg-config
-dnl
-AC_DEFUN([AM_PATH_GLIB_2_0],
-[dnl 
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(glibtest, [  --disable-glibtest      do not try to compile and run a test GLIB program],
-		    , enable_glibtest=yes)
-
-  pkg_config_args=glib-2.0
-  for module in . $4
-  do
-      case "$module" in
-         gmodule) 
-             pkg_config_args="$pkg_config_args gmodule-2.0"
-         ;;
-         gmodule-no-export) 
-             pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
-         ;;
-         gobject) 
-             pkg_config_args="$pkg_config_args gobject-2.0"
-         ;;
-         gthread) 
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-         gio*) 
-             pkg_config_args="$pkg_config_args $module-2.0"
-         ;;
-      esac
-  done
-
-  PKG_PROG_PKG_CONFIG([0.16])
-
-  no_glib=""
-
-  if test "x$PKG_CONFIG" = x ; then
-    no_glib=yes
-    PKG_CONFIG=no
-  fi
-
-  min_glib_version=ifelse([$1], ,2.0.0,$1)
-  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-
-  if test x$PKG_CONFIG != xno ; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-	  echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
-	  enable_glibtest=no
-    fi
-
-    if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
-	  :
-    else
-	  no_glib=yes
-    fi
-  fi
-
-  if test x"$no_glib" = x ; then
-    GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-    GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
-    GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-    GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0`
-
-    GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
-    GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
-    glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_glibtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GLIB_CFLAGS"
-      LIBS="$GLIB_LIBS $LIBS"
-dnl
-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
-      rm -f conf.glibtest
-      AC_TRY_RUN([
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  unsigned int major, minor, micro;
-  char *tmp_version;
-
-  fclose (fopen ("conf.glibtest", "w"));
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_glib_version");
-  if (sscanf(tmp_version, "%u.%u.%u", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_glib_version");
-     exit(1);
-   }
-
-  if ((glib_major_version != $glib_config_major_version) ||
-      (glib_minor_version != $glib_config_minor_version) ||
-      (glib_micro_version != $glib_config_micro_version))
-    {
-      printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
-             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-             glib_major_version, glib_minor_version, glib_micro_version);
-      printf ("*** was found! If pkg-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-      printf("*** to point to the correct configuration files\n");
-    } 
-  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-	   (glib_minor_version != GLIB_MINOR_VERSION) ||
-           (glib_micro_version != GLIB_MICRO_VERSION))
-    {
-      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     glib_major_version, glib_minor_version, glib_micro_version);
-    }
-  else
-    {
-      if ((glib_major_version > major) ||
-        ((glib_major_version == major) && (glib_minor_version > minor)) ||
-        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n",
-               glib_major_version, glib_minor_version, glib_micro_version);
-        printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
-        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_glib" = x ; then
-     AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$PKG_CONFIG" = "no" ; then
-       echo "*** A new enough version of pkg-config was not found."
-       echo "*** See http://www.freedesktop.org/software/pkgconfig/"
-     else
-       if test -f conf.glibtest ; then
-        :
-       else
-          echo "*** Could not run GLIB test program, checking why..."
-          ac_save_CFLAGS="$CFLAGS"
-          ac_save_LIBS="$LIBS"
-          CFLAGS="$CFLAGS $GLIB_CFLAGS"
-          LIBS="$LIBS $GLIB_LIBS"
-          AC_TRY_LINK([
-#include <glib.h>
-#include <stdio.h>
-],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GLIB_CFLAGS=""
-     GLIB_LIBS=""
-     GLIB_GENMARSHAL=""
-     GOBJECT_QUERY=""
-     GLIB_MKENUMS=""
-     GLIB_COMPILE_RESOURCES=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GLIB_CFLAGS)
-  AC_SUBST(GLIB_LIBS)
-  AC_SUBST(GLIB_GENMARSHAL)
-  AC_SUBST(GOBJECT_QUERY)
-  AC_SUBST(GLIB_MKENUMS)
-  AC_SUBST(GLIB_COMPILE_RESOURCES)
-  rm -f conf.glibtest
-])