Fix losetup so that it A) actually works again, B) has much better error

[oweals/busybox.git] / libbb / read_package_field.c

diff --git a/libbb/read_package_field.c b/libbb/read_package_field.c
index f561df8311b10c600478654cf506bcbb2aeb1a02..4292689ca9d9681ae861ebaadae10048dba98aed 100644 (file)
--- a/libbb/read_package_field.c
+++ b/libbb/read_package_field.c
@@ -1,3 +1,26 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) many different people.
+ * If you wrote this, please acknowledge your work.
+ *
+ * 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 of the License, 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
 #include <stdlib.h>
 #include <string.h>
 #include "libbb.h"
@@ -54,7 +77,7 @@ int read_package_field(const char *package_buffer, char **field_name, char **fie
                                }
                                break;
                }
-               if (exit_flag == TRUE) {
+               if (exit_flag) {
                        /* Check that the names are valid */
                        offset_value_end = offset;
                        name_length = offset_name_end - offset_name_start;
@@ -79,10 +102,10 @@ int read_package_field(const char *package_buffer, char **field_name, char **fie
        if (name_length == 0) {
                *field_name = NULL;
        } else {
-               *field_name = xstrndup(&package_buffer[offset_name_start], name_length);
+               *field_name = bb_xstrndup(&package_buffer[offset_name_start], name_length);
        }
        if (value_length > 0) {
-               *field_value = xstrndup(&package_buffer[offset_value_start], value_length);
+               *field_value = bb_xstrndup(&package_buffer[offset_value_start], value_length);
        } else {
                *field_value = NULL;
        }