Commit 30166261 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Move string_is_key_value to lib/encoding

parent 48ebd9bf

src/common/util.c

+0 −33
Original line number Diff line number Diff line
@@ -225,39 +225,6 @@ add_laplace_noise(int64_t signal_, double random_, double delta_f, 
 * String manipulation

 * ===== */



/** Return true if <b>string</b> is a valid 'key=[value]' string.

 *  "value" is optional, to indicate the empty string. Log at logging

 *  <b>severity</b> if something ugly happens. */

int

string_is_key_value(int severity, const char *string)

{

  /* position of equal sign in string */

  const char *equal_sign_pos = NULL;



  tor_assert(string);



  if (strlen(string) < 2) { /* "x=" is shortest args string */

    tor_log(severity, LD_GENERAL, "'%s' is too short to be a k=v value.",

            escaped(string));

    return 0;

  }



  equal_sign_pos = strchr(string, '=');

  if (!equal_sign_pos) {

    tor_log(severity, LD_GENERAL, "'%s' is not a k=v value.", escaped(string));

    return 0;

  }



  /* validate that the '=' is not in the beginning of the string. */

  if (equal_sign_pos == string) {

    tor_log(severity, LD_GENERAL, "'%s' is not a valid k=v value.",

            escaped(string));

    return 0;

  }



  return 1;

}



/** Return a newly allocated string equal to <b>string</b>, except that every

 * character in <b>chars_to_escape</b> is preceded by a backslash. */

char *

src/common/util.h

+0 −2
Original line number Diff line number Diff line
@@ -72,8 +72,6 @@ int64_t clamp_double_to_int64(double number); 


/* String manipulation */



int string_is_key_value(int severity, const char *string);



char *tor_escape_str_for_pt_args(const char *string,

                                 const char *chars_to_escape);

src/lib/encoding/include.am

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ src_lib_libtor_encoding_a_SOURCES = \ 
	src/lib/encoding/binascii.c			\

        src/lib/encoding/confline.c			\

        src/lib/encoding/cstring.c			\

        src/lib/encoding/keyval.c			\

	src/lib/encoding/time_fmt.c



src_lib_libtor_encoding_testing_a_SOURCES = \
@@ -19,4 +20,5 @@ noinst_HEADERS += \ 
	src/lib/encoding/binascii.h			\

        src/lib/encoding/confline.h			\

        src/lib/encoding/cstring.h			\

        src/lib/encoding/keyval.h			\

	src/lib/encoding/time_fmt.h

src/lib/encoding/keyval.c

0 → 100644
+46 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2003, Roger Dingledine

 * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.

 * Copyright (c) 2007-2018, The Tor Project, Inc. */

/* See LICENSE for licensing information */



#include "orconfig.h"

#include "lib/encoding/keyval.h"

#include "lib/log/escape.h"

#include "lib/log/torlog.h"

#include "lib/log/util_bug.h"



#include <stdlib.h>

#include <string.h>



/** Return true if <b>string</b> is a valid 'key=[value]' string.

 *  "value" is optional, to indicate the empty string. Log at logging

 *  <b>severity</b> if something ugly happens. */

int

string_is_key_value(int severity, const char *string)

{

  /* position of equal sign in string */

  const char *equal_sign_pos = NULL;



  tor_assert(string);



  if (strlen(string) < 2) { /* "x=" is shortest args string */

    tor_log(severity, LD_GENERAL, "'%s' is too short to be a k=v value.",

            escaped(string));

    return 0;

  }



  equal_sign_pos = strchr(string, '=');

  if (!equal_sign_pos) {

    tor_log(severity, LD_GENERAL, "'%s' is not a k=v value.", escaped(string));

    return 0;

  }



  /* validate that the '=' is not in the beginning of the string. */

  if (equal_sign_pos == string) {

    tor_log(severity, LD_GENERAL, "'%s' is not a valid k=v value.",

            escaped(string));

    return 0;

  }



  return 1;

}

src/lib/encoding/keyval.h

0 → 100644
+11 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2003, Roger Dingledine

 * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.

 * Copyright (c) 2007-2018, The Tor Project, Inc. */

/* See LICENSE for licensing information */



#ifndef TOR_KEYVAL_H

#define TOR_KEYVAL_H



int string_is_key_value(int severity, const char *string);



#endif