xnu-1228.tar.gz

[apple/xnu.git] / osfmk / ddb / db_macro.c

diff --git a/osfmk/ddb/db_macro.c b/osfmk/ddb/db_macro.c
index c82deb92d7887d5bd4e055233176ab0b23468fed..9e9e6cf98a27e6cb04e03af6d515a9f7eec9f28d 100644 (file)
--- a/osfmk/ddb/db_macro.c
+++ b/osfmk/ddb/db_macro.c
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -53,7 +56,7 @@
 /*
  */
 #include <kern/thread.h>
-#include <string.h>                    /* For strcmp(), strcpy() */
+#include <string.h>                    /* For strncmp(), strlcpy() */
 
 #include <machine/db_machdep.h>
 #include <ddb/db_command.h>
@@ -94,7 +97,7 @@ db_lookup_macro(char *name)
        for (mp = db_user_macro; mp < &db_user_macro[DB_NUSER_MACRO]; mp++) {
            if (mp->m_name[0] == 0)
                continue;
-           if (strcmp(mp->m_name, name) == 0)
+           if (strncmp(mp->m_name, name, TOK_STRING_SIZE) == 0)
                return(mp);
        }
        return(0);
@@ -122,7 +125,7 @@ db_def_macro_cmd(void)
                db_error("ddb: internal error(macro)\n");
                /* NOTREACHED */
            db_macro_free--;
-           strcpy(mp->m_name, db_tok_string);
+           strlcpy(mp->m_name, db_tok_string, TOK_STRING_SIZE);
        }
        for (c = db_read_char(); c == ' ' || c == '\t'; c = db_read_char());
        for (p = mp->m_lbuf; c > 0; c = db_read_char())
@@ -134,7 +137,7 @@ db_def_macro_cmd(void)
 void
 db_del_macro_cmd(void)
 {
-       register struct db_user_macro *mp;
+       struct db_user_macro *mp = NULL;
 
        if (db_read_token() != tIDENT 
            || (mp = db_lookup_macro(db_tok_string)) == 0) {
@@ -160,7 +163,7 @@ db_show_macro(void)
        for (mp = db_user_macro; mp < &db_user_macro[DB_NUSER_MACRO]; mp++) {
            if (mp->m_name[0] == 0)
                continue;
-           if (name && strcmp(mp->m_name, name))
+           if (name && strncmp(mp->m_name, name, TOK_STRING_SIZE))
                continue;
            db_printf("%s: %s", mp->m_name, mp->m_lbuf);
        }
@@ -192,11 +195,8 @@ db_exec_macro(char *name)
 }
 
 int
-db_arg_variable(
-       struct db_variable      *vp,
-       db_expr_t               *valuep,
-       int                     flag,
-       db_var_aux_param_t      ap)
+db_arg_variable(__unused struct db_variable *vp, db_expr_t *valuep, int flag,
+               db_var_aux_param_t ap)
 {
        db_expr_t value;
        char *name;
@@ -204,12 +204,12 @@ db_arg_variable(
 
        if (flag == DB_VAR_SHOW) {
            value = db_macro_args[ap->hidden_level][ap->suffix[0]-1];
-           db_printf("%#lln", value);
+           db_printf("%#lln", (unsigned long long)value);
            db_find_xtrn_task_sym_and_offset(value, &name, &offset, TASK_NULL);
            if (name != (char *)0 && offset <= db_maxoff && offset != value) {
                db_printf("\t%s", name);
                if (offset != 0)
-                   db_printf("+%#r", offset);
+                   db_printf("+%#llr", (unsigned long long)offset);
            }
            return(0);
        }