From d94a6a6402b1e1d4c7e9098f3f57fd07f0d59e99 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Thu, 6 Feb 2014 15:54:52 +0100 Subject: [PATCH] Aggiunta la funzione SolipaUtils::compare_version. --- .project | 66 +++++++++++++++++++----------- src/utils.c | 75 ++++++++++++++++++++++++++++++++++- src/utils.h | 4 +- tests/Makefile.am | 1 + tests/utils_compare_version.c | 46 +++++++++++++++++++++ 5 files changed, 166 insertions(+), 26 deletions(-) create mode 100644 tests/utils_compare_version.c diff --git a/.project b/.project index 20175df..eca435d 100644 --- a/.project +++ b/.project @@ -69,7 +69,7 @@ - 1325156677028 + 1391696678342 22 @@ -78,7 +78,7 @@ - 1325156677034 + 1391696678346 22 @@ -87,7 +87,7 @@ - 1325156677038 + 1391696678351 22 @@ -96,7 +96,7 @@ - 1325156677042 + 1391696678356 22 @@ -105,7 +105,7 @@ - 1325156677046 + 1391696678361 22 @@ -114,7 +114,7 @@ - 1325156677050 + 1391696678365 30 @@ -123,7 +123,7 @@ - 1325156677053 + 1391696678370 30 @@ -132,7 +132,7 @@ - 1325156677056 + 1391696678376 22 @@ -141,7 +141,7 @@ - 1325156677059 + 1391696678381 22 @@ -150,7 +150,7 @@ - 1325156677062 + 1391696678386 22 @@ -159,7 +159,7 @@ - 1325156677066 + 1391696678398 22 @@ -168,7 +168,7 @@ - 1325156677069 + 1391696678402 22 @@ -177,7 +177,7 @@ - 1325156677073 + 1391696678406 22 @@ -186,7 +186,7 @@ - 1325156677076 + 1391696678410 22 @@ -195,7 +195,7 @@ - 1325156677079 + 1391696678414 22 @@ -204,7 +204,7 @@ - 1325156677083 + 1391696678548 22 @@ -213,7 +213,7 @@ - 1325156677086 + 1391696678551 22 @@ -222,7 +222,7 @@ - 1325156677094 + 1391696678555 22 @@ -231,7 +231,7 @@ - 1325156677099 + 1391696678559 22 @@ -240,7 +240,7 @@ - 1325156677103 + 1391696678563 22 @@ -249,7 +249,7 @@ - 1325156677107 + 1391696678567 22 @@ -258,7 +258,7 @@ - 1325156677111 + 1391696678570 22 @@ -267,7 +267,7 @@ - 1325156677114 + 1391696678574 22 @@ -276,7 +276,7 @@ - 1325156677119 + 1391696678578 22 @@ -284,5 +284,23 @@ 1.0-name-matches-false-false-libtool + + 1391696678582 + + 22 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-*.dll + + + + 1391696678588 + + 22 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-*.a + + diff --git a/src/utils.c b/src/utils.c index da10b12..0df8d6b 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2012 Andrea Zagli + * Copyright (C) 2010-2014 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1921,6 +1921,79 @@ solipa_apri_collegamento (GtkWindow *transient, const gchar *indirizzo) #endif } +int +solipa_compare_version (const gchar *ver1, const gchar *ver2, const gchar *delimiters, guint *part) +{ + gchar **_ver1; + gchar **_ver2; + + gchar *_delimiters; + + guint i; + guint l; + + if (ver1 == NULL) + { + return -1; + } + if (ver2 == NULL) + { + return 1; + } + + if (delimiters == NULL) + { + _delimiters = g_strdup ("."); + } + else + { + _delimiters = g_strstrip (g_strdup (delimiters)); + if (g_strcmp0 (_delimiters, "") == 0) + { + g_free (_delimiters); + _delimiters = g_strdup ("."); + } + } + + _ver1 = g_strsplit (g_strstrip (g_strdup (ver1)), _delimiters, -1); + _ver2 = g_strsplit (g_strstrip (g_strdup (ver2)), _delimiters, -1); + + l = MIN (g_strv_length (_ver1), g_strv_length (_ver2)); + for (i = 0; i < l; i++) + { + if (strtol (_ver1[i], NULL, 10) < strtol (_ver2[i], NULL, 10)) + { + if (part != NULL) + { + *part = i; + } + return -1; + } + else if (strtol (_ver1[i], NULL, 10) > strtol (_ver2[i], NULL, 10)) + { + if (part != NULL) + { + *part = i; + } + return 1; + } + } + + if (g_strv_length (_ver1) < g_strv_length (_ver2)) + { + *part = g_strv_length (_ver1) + 1; + return -1; + } + else if (g_strv_length (_ver1) > g_strv_length (_ver2)) + { + *part = g_strv_length (_ver2) + 1; + return 1; + } + + *part = 0; + return 0; +} + /** * This function is copied from * http://bugzilla.gnome.org/show_bug.cgi?id=524831. diff --git a/src/utils.h b/src/utils.h index d6b6817..1176a64 100644 --- a/src/utils.h +++ b/src/utils.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 Andrea Zagli + * Copyright (C) 2010-2014 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -105,6 +105,8 @@ void solipa_gstring_initial_capital (GString *gstring); void solipa_apri_collegamento (GtkWindow *transient, const gchar *indirizzo); +int solipa_compare_version (const gchar *ver1, const gchar *ver2, const gchar *delimiters, guint *part); + gchar *g_mkdtemp (gchar *tmpl); diff --git a/tests/Makefile.am b/tests/Makefile.am index 1dc28b6..66e5bbc 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -23,6 +23,7 @@ noinst_PROGRAMS = allegato \ utils \ utils_apri_collegamento \ utils_codfisc_piva \ + utils_compare_version \ utils_format_money \ utils_gdatetime \ utils_gstring_initial_capital \ diff --git a/tests/utils_compare_version.c b/tests/utils_compare_version.c new file mode 100644 index 0000000..7c85be0 --- /dev/null +++ b/tests/utils_compare_version.c @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2014 Andrea Zagli + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include + +int +main (int argc, char *argv[]) +{ + int ret; + guint part; + + g_type_init (); + + if (argc == 3) + { + ret = solipa_compare_version (argv[1], argv[2], NULL, &part); + g_message ("%s è %s %s (%d)", + argv[1], + ret == -1 ? "minore di" : ret == 0 ? "uguale a" : "maggiore di", + argv[2], + part); + } + else + { + g_message ("Usage: utils_compare_version "); + return 0; + } + + return 0; +} -- 2.49.0