JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

also Xcheck_grow_ may not end with an underscore

Browse Source
This commit is contained in:
tg
2011-10-25 22:25:07 +00:00
parent 5893a36bad
commit cd7dab250b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
misc.c
View File

@@ -29,7 +29,7 @@
#include <grp.h> #include <grp.h>
#endif #endif
__RCSID("$MirOS: src/bin/mksh/misc.c,v 1.174 2011/10/24 19:40:58 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/misc.c,v 1.175 2011/10/25 22:25:06 tg Exp $");
/* type bits for unsigned char */ /* type bits for unsigned char */
unsigned char chtypes[UCHAR_MAX + 1]; unsigned char chtypes[UCHAR_MAX + 1];
@@ -96,7 +96,7 @@ initctypes(void)
/* called from XcheckN() to grow buffer */ /* called from XcheckN() to grow buffer */
char * char *
Xcheck_grow_(XString *xsp, const char *xp, size_t more) Xcheck_grow(XString *xsp, const char *xp, size_t more)
{ {
const char *old_beg = xsp->beg; const char *old_beg = xsp->beg;

6
sh.h
View File

@@ -151,7 +151,7 @@
#endif #endif
#ifdef EXTERN #ifdef EXTERN
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.496 2011/10/24 19:41:13 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/sh.h,v 1.497 2011/10/25 22:25:07 tg Exp $");
#endif #endif
#define MKSH_VERSION "R40 2011/10/24" #define MKSH_VERSION "R40 2011/10/24"
@@ -1297,7 +1297,7 @@ typedef char *XStringP;
#define XcheckN(xs, xp, n) do { \ #define XcheckN(xs, xp, n) do { \
ssize_t more = ((xp) + (n)) - (xs).end; \ ssize_t more = ((xp) + (n)) - (xs).end; \
if (more > 0) \ if (more > 0) \
(xp) = Xcheck_grow_(&(xs), (xp), more); \ (xp) = Xcheck_grow(&(xs), (xp), more); \
} while (/* CONSTCOND */ 0) } while (/* CONSTCOND */ 0)
/* check for overflow, expand string */ /* check for overflow, expand string */
@@ -1318,7 +1318,7 @@ typedef char *XStringP;
#define Xsavepos(xs, xp) ((xp) - (xs).beg) #define Xsavepos(xs, xp) ((xp) - (xs).beg)
#define Xrestpos(xs, xp, n) ((xs).beg + (n)) #define Xrestpos(xs, xp, n) ((xs).beg + (n))
char *Xcheck_grow_(XString *, const char *, size_t); char *Xcheck_grow(XString *, const char *, size_t);
/* /*
* expandable vector of generic pointers * expandable vector of generic pointers