Remove str_util.{c,h}

git-svn-id: http://opkg.googlecode.com/svn/trunk@383 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358

diff --git a/libopkg/Makefile.am b/libopkg/Makefile.am
index 067d867206ccad8d2e006b72a6d627c074504852..c7a0a9eb10e0c32b072694a4a17725c2814db430 100644 (file)
--- a/libopkg/Makefile.am
+++ b/libopkg/Makefile.am
@@ -27,7 +27,7 @@ opkg_list_sources = conffile.c conffile.h conffile_list.c conffile_list.h \
                    str_list.c str_list.h void_list.c void_list.h \
                    active_list.c active.list.h list.h 
 opkg_util_sources = file_util.c file_util.h opkg_message.h opkg_message.c md5.c md5.h \
-                   sprintf_alloc.c sprintf_alloc.h str_util.c str_util.h \
+                   sprintf_alloc.c sprintf_alloc.h \
                    xregex.c xregex.h xsystem.c xsystem.h
 if HAVE_PATHFINDER
 opkg_util_sources += opkg_pathfinder.c opkg_pathfinder.h

diff --git a/libopkg/opkg_cmd.c b/libopkg/opkg_cmd.c
index fe35ea0547f0dbeae54e6bb94ee79793c977367d..0fb3c8591a716479d0ca0f295927b38864e08905 100644 (file)
--- a/libopkg/opkg_cmd.c
+++ b/libopkg/opkg_cmd.c
@@ -30,7 +30,6 @@
 #include "sprintf_alloc.h"
 #include "pkg.h"
 #include "file_util.h"
-#include "str_util.h"
 #include "libbb/libbb.h"
 #include "opkg_utils.h"
 #include "opkg_defines.h"

diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c
index 193ae5c66d286818e69c7c23b2285381002e132b..df5b7b40efd3de1028897444c99e789682acb11d 100644 (file)
--- a/libopkg/opkg_conf.c
+++ b/libopkg/opkg_conf.c
@@ -24,7 +24,6 @@
 #include "args.h"
 #include "opkg_message.h"
 #include "file_util.h"
-#include "str_util.h"
 #include "opkg_defines.h"
 #include "libbb/libbb.h"
 

diff --git a/libopkg/opkg_download.c b/libopkg/opkg_download.c
index 47892499ed6026067b816ae95b3a34c395d1feba..49a48a08631cdbfa308026c615abd962dfa1453d 100644 (file)
--- a/libopkg/opkg_download.c
+++ b/libopkg/opkg_download.c
@@ -46,7 +46,6 @@
 #include "sprintf_alloc.h"
 #include "xsystem.h"
 #include "file_util.h"
-#include "str_util.h"
 #include "opkg_defines.h"
 #include "libbb/libbb.h"
 
@@ -71,6 +70,12 @@ static CURL *curl = NULL;
 static CURL *opkg_curl_init(opkg_conf_t *conf, curl_progress_func cb, void *data);
 #endif
 
+static int
+str_starts_with(const char *str, const char *prefix)
+{
+    return (strncmp(str, prefix, strlen(prefix)) == 0);
+}
+
 int opkg_download(opkg_conf_t *conf, const char *src,
   const char *dest_file_name, curl_progress_func cb, void *data)
 {

diff --git a/libopkg/opkg_install.c b/libopkg/opkg_install.c
index e848d99e1d4b68c407b73d3a1e60bfbb3f4977ab..881759179b8043ce0a18877c7e4d090ba14623e5 100644 (file)
--- a/libopkg/opkg_install.c
+++ b/libopkg/opkg_install.c
@@ -38,7 +38,6 @@
 
 #include "sprintf_alloc.h"
 #include "file_util.h"
-#include "str_util.h"
 #include "xsystem.h"
 #include "user.h"
 #include "libbb/libbb.h"

diff --git a/libopkg/opkg_remove.c b/libopkg/opkg_remove.c
index a4819de56336f2934ee6a3392fb51b9730e8e58b..f744585a413edc51ce3d1f2dcb77712597fb2b93 100644 (file)
--- a/libopkg/opkg_remove.c
+++ b/libopkg/opkg_remove.c
@@ -26,7 +26,6 @@
 
 #include "file_util.h"
 #include "sprintf_alloc.h"
-#include "str_util.h"
 #include "libbb/libbb.h"
 
 /*

diff --git a/libopkg/pkg.c b/libopkg/pkg.c
index 58e92a02629186abd1f327cfaee7d760ad10167e..be25c5c15c70c9dbbb0dbd210d43d00d700d190c 100644 (file)
--- a/libopkg/pkg.c
+++ b/libopkg/pkg.c
@@ -32,7 +32,6 @@
 #include "libbb/libbb.h"
 #include "sprintf_alloc.h"
 #include "file_util.h"
-#include "str_util.h"
 #include "xsystem.h"
 #include "opkg_conf.h"
 

diff --git a/libopkg/pkg_dest.c b/libopkg/pkg_dest.c
index 083f97c9140e819a678ee6d03b7cd3cfbf66138c..adc5e1f2a475621485b47ec6bafea5a97754aa88 100644 (file)
--- a/libopkg/pkg_dest.c
+++ b/libopkg/pkg_dest.c
@@ -19,7 +19,6 @@
 
 #include "pkg_dest.h"
 #include "file_util.h"
-#include "str_util.h"
 #include "sprintf_alloc.h"
 #include "opkg_conf.h"
 #include "opkg_cmd.h"
@@ -31,7 +30,7 @@ int pkg_dest_init(pkg_dest_t *dest, const char *name, const char *root_dir,const
     dest->name = xstrdup(name);
 
     /* Guarantee that dest->root_dir ends with a '/' */
-    if (str_ends_with(root_dir, "/")) {
+    if (root_dir[strlen(root_dir) -1] == '/') {
        dest->root_dir = xstrdup(root_dir);
     } else {
        sprintf_alloc(&dest->root_dir, "%s/", root_dir);
@@ -42,7 +41,7 @@ int pkg_dest_init(pkg_dest_t *dest, const char *name, const char *root_dir,const
                  dest->root_dir, OPKG_STATE_DIR_PREFIX);
     file_mkdir_hier(dest->opkg_dir, 0755);
 
-    if (str_starts_with (lists_dir, "/")) 
+    if (lists_dir[0] == '/')
         sprintf_alloc(&dest->lists_dir, "%s", lists_dir);
     else
         sprintf_alloc(&dest->lists_dir, "/%s", lists_dir);

diff --git a/libopkg/str_util.c b/libopkg/str_util.c
deleted file mode 100644 (file)
index 58fdb9c..0000000
--- a/libopkg/str_util.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* str_utils.c - the opkg package management system
-
-   Carl D. Worth
-
-   Copyright (C) 2001 University of Southern California
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2, or (at
-   your option) any later version.
-
-   This program 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
-   General Public License for more details.
-*/
-
-#include "includes.h"
-
-int str_starts_with(const char *str, const char *prefix)
-{
-    return (strncmp(str, prefix, strlen(prefix)) == 0);
-}
-
-int str_ends_with(const char *str, const char *suffix)
-{
-    int suffix_len;
-    int str_len;
-
-    str_len = strlen(str);
-    suffix_len = strlen(suffix);
-
-    if (str_len < suffix_len) {
-       return 0;
-    }
-
-    return (strcmp(str + str_len - suffix_len, suffix) == 0);
-}
-
-int str_tolower(char *str)
-{
-    while (*str) {
-       *str = tolower(*str);
-       str++;
-    }
-
-    return 0;
-}
-
-int str_toupper(char *str)
-{
-    while (*str) {
-       *str = toupper(*str);
-       str++;
-    }
-
-    return 0;
-}

diff --git a/libopkg/str_util.h b/libopkg/str_util.h
deleted file mode 100644 (file)
index 02861e6..0000000
--- a/libopkg/str_util.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* str_utils.h - the opkg package management system
-
-   Carl D. Worth
-
-   Copyright (C) 2001 University of Southern California
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2, or (at
-   your option) any later version.
-
-   This program 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
-   General Public License for more details.
-*/
-
-#ifndef STR_UTILS_H
-#define STR_UTILS_H
-
-int str_starts_with(const char *str, const char *prefix);
-int str_ends_with(const char *str, const char *suffix);
-int str_tolower(char *str);
-int str_toupper(char *str);
-
-#endif

diff --git a/libopkg/user.c b/libopkg/user.c
index e04f04ded14a52942c3ecd5696ba20c37c6576c3..ee54eb672c96b7fd34f6237ffd2444c3dd42cb5b 100644 (file)
--- a/libopkg/user.c
+++ b/libopkg/user.c
@@ -18,11 +18,13 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <unistd.h>
+#include <ctype.h>
+
 #include "file_util.h"
-#include "str_util.h"
 
 char *get_user_response(const char *format, ...)
 {
+       int i;
        va_list ap;
        char *response;
 
@@ -37,7 +39,8 @@ char *get_user_response(const char *format, ...)
        if (response == NULL)
                return NULL;
 
-       str_tolower(response);
+       for (i=0; response[i]; i++)
+               response[i] = tolower(response[i]);
 
        return response;
 }