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

save 1640 .text bytes in MKSH_SMALL case by not inlining strdupx, strndupx

Browse Source
This commit is contained in:
tg 2008-10-28 14:51:06 +00:00
parent 88d7b7d08b
commit bf3194e937
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
misc.c
View File

@ -6,7 +6,7 @@
#include <grp.h> #include <grp.h>
#endif #endif
__RCSID("$MirOS: src/bin/mksh/misc.c,v 1.88 2008/10/28 14:32:42 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/misc.c,v 1.89 2008/10/28 14:51:06 tg Exp $");
#undef USE_CHVT #undef USE_CHVT
#if defined(TIOCSCTTY) && !defined(MKSH_SMALL) #if defined(TIOCSCTTY) && !defined(MKSH_SMALL)
@ -1422,3 +1422,23 @@ stristr(const char *b, const char *l)
} }
#endif #endif
#endif #endif
#ifdef MKSH_SMALL
char *
strndup_(const char *src, size_t len, Area *ap)
{
char *dst = NULL;
if (src != NULL) {
dst = alloc(++len, ap);
strlcpy(dst, src, len);
}
return (dst);
}
char *
strdup_(const char *src, Area *ap)
{
return (src == NULL ? NULL : strndup_(src, strlen(src), ap));
}
#endif

15
sh.h
View File

@ -100,7 +100,7 @@
#define __SCCSID(x) __IDSTRING(sccsid,x) #define __SCCSID(x) __IDSTRING(sccsid,x)
#ifdef EXTERN #ifdef EXTERN
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.248 2008/10/28 14:32:42 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/sh.h,v 1.249 2008/10/28 14:51:06 tg Exp $");
#endif #endif
#define MKSH_VERSION "R36 2008/10/28" #define MKSH_VERSION "R36 2008/10/28"
@ -345,6 +345,14 @@ char *ucstrstr(char *, const char *);
(dst) = (src) + utf_ptradjx_len; \ (dst) = (src) + utf_ptradjx_len; \
} while (/* CONSTCOND */ 0) } while (/* CONSTCOND */ 0)
#ifdef MKSH_SMALL
#define strdupx(d, s, ap) do { \
(d) = strdup_((s), (ap)); \
} while (/* CONSTCOND */ 0)
#define strndupx(d, s, n, ap) do { \
(d) = strndup_((s), (n), (ap)); \
} while (/* CONSTCOND */ 0)
#else
/* be careful to evaluate arguments only once! */ /* be careful to evaluate arguments only once! */
#define strdupx(d, s, ap) do { \ #define strdupx(d, s, ap) do { \
const char *strdup_src = (s); \ const char *strdup_src = (s); \
@ -368,6 +376,7 @@ char *ucstrstr(char *, const char *);
} \ } \
(d) = strdup_dst; \ (d) = strdup_dst; \
} while (/* CONSTCOND */ 0) } while (/* CONSTCOND */ 0)
#endif
#if HAVE_STRCASESTR #if HAVE_STRCASESTR
#define stristr(b,l) ((const char *)strcasestr((b), (l))) #define stristr(b,l) ((const char *)strcasestr((b), (l)))
@ -1472,6 +1481,10 @@ int make_path(const char *, const char *, char **, XString *, int *);
void simplify_path(char *); void simplify_path(char *);
char *get_phys_path(const char *); char *get_phys_path(const char *);
void set_current_wd(char *); void set_current_wd(char *);
#ifdef MKSH_SMALL
char *strdup_(const char *, Area *);
char *strndup_(const char *, size_t, Area *);
#endif
/* shf.c */ /* shf.c */
struct shf *shf_open(const char *, int, int, int); struct shf *shf_open(const char *, int, int, int);
struct shf *shf_fdopen(int, int, struct shf *); struct shf *shf_fdopen(int, int, struct shf *);