Merge branch 'release'

[notmuch] / util / string-util.c

diff --git a/util/string-util.c b/util/string-util.c
index 76c0b9025d0f535243ac7003d5316b22e7e53f17..18125309ebe9ed33c048f928e02d1e6b35edca28 100644 (file)
--- a/util/string-util.c
+++ b/util/string-util.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Jani Nikula <jani@nikula.org>
  */
@@ -222,6 +222,19 @@ parse_boolean_term (void *ctx, const char *str,
     return -1;
 }
 
+int
+strcmp_null (const char *s1, const char *s2)
+{
+    if (s1 && s2)
+       return strcmp (s1, s2);
+    else if (! s1 && ! s2)
+       return 0;
+    else if (s1)
+       return 1;       /* s1 (non-NULL) is greater than s2 (NULL) */
+    else
+       return -1;      /* s1 (NULL) is less than s2 (non-NULL) */
+}
+
 int
 strcase_equal (const void *a, const void *b)
 {