Chameleon Commit Details - 2292 - Chameleon open source boot loader project.

Date:

2014-01-07 08:15:50 (10 years 3 months ago)

Author:

Chuck Fry

Commit:

2292

Parents:

2291

Message:

Implement snprintf(); implement missing zero-fill in strncpy()

Changes:

M	/branches/chucko/i386/libsa/libsa.h
M	/branches/chucko/i386/libsa/printf.c
M	/branches/chucko/i386/libsa/string.c

File differences

-136
137 137
138 138
139
139 140
140 141
141 142
+ * printf.c␊
 */␊
extern int sprintf(char *s, const char * format, ...);␊
extern int snprintf(char *s, size_t size, const char * format, ...);␊
extern int slvprintf(char * buffer, int len, const char * fmt, va_list arg);␊
␊
/*␊
  * printf.c␊
  */␊
 extern int sprintf(char *s, const char * format, ...);␊
+extern int snprintf(char *s, size_t size, const char * format, ...);␊
 extern int slvprintf(char * buffer, int len, const char * fmt, va_list arg);␊
 ␊
 /*␊

-63
64 64
65 65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
66 81
67 82
68 83
+}␊
␊
/*VARARGS1*/␊
int snprintf(char * str, size_t size, const char * fmt, ...)␊
{␊
    va_list ap;␊
    struct putc_info pi;␊
␊
    va_start(ap, fmt);␊
    pi.str = str;␊
    pi.last_str = str + size - 1;␊
    prf(fmt, ap, sputc, &pi);␊
    *pi.str = '\0';␊
    va_end(ap);␊
    return (pi.str - str);␊
}␊
␊
/*VARARGS1*/␊
int slvprintf(char * str, int len, const char * fmt, va_list ap)␊
{␊
    struct putc_info pi;␊
 }␊
 ␊
 /*VARARGS1*/␊
+int snprintf(char * str, size_t size, const char * fmt, ...)␊
+{␊
+    va_list ap;␊
+    struct putc_info pi;␊
+␊
+    va_start(ap, fmt);␊
+    pi.str = str;␊
+    pi.last_str = str + size - 1;␊
+    prf(fmt, ap, sputc, &pi);␊
+    *pi.str = '\0';␊
+    va_end(ap);␊
+    return (pi.str - str);␊
+}␊
+␊
+/*VARARGS1*/␊
 int slvprintf(char * str, int len, const char * fmt, va_list ap)␊
 {␊
     struct putc_info pi;␊

-161
162 162
163 163
164 
164
165
166
167
165 168
166 169
167 170
+{␊
␉register char *ret = s1;␊
␉while (n && (*s1++ = *s2++))␊
␉␉n--;␊
      --n;␊
    /* while (n--) *s1++ = '\0'; */␊
    if (n > 0)␊
      bzero(s1, n);␊
␉return ret;␊
}␊
␊
 {␊
 ␉register char *ret = s1;␊
 ␉while (n && (*s1++ = *s2++))␊
-␉␉n--;␊
+      --n;␊
+    /* while (n--) *s1++ = '\0'; */␊
+    if (n > 0)␊
+      bzero(s1, n);␊
 ␉return ret;␊
 }␊
 ␊