From fcc59eee48e1be7ead85b47bd2f6acb8e977dc25 Mon Sep 17 00:00:00 2001 From: tg Date: Sun, 8 Mar 2015 21:30:22 +0000 Subject: [PATCH] remove some unused string pooling stuff --- funcs.c | 4 ++-- main.c | 6 +++--- sh.h | 7 +------ 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/funcs.c b/funcs.c index 825b9ca..7e10ce6 100644 --- a/funcs.c +++ b/funcs.c @@ -38,7 +38,7 @@ #endif #endif -__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.264 2015/01/04 21:08:09 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.265 2015/03/08 21:30:20 tg Exp $"); #if HAVE_KILLPG /* @@ -138,7 +138,7 @@ const struct builtin mkshbuiltins[] = { {"ulimit", c_ulimit}, {"umask", c_umask}, {Tunalias, c_unalias}, - {Tsgunset, c_unset}, + {"*=unset", c_unset}, {"=wait", c_wait}, {"whence", c_whence}, #ifndef MKSH_UNEMPLOYED diff --git a/main.c b/main.c index 38b8165..0a70490 100644 --- a/main.c +++ b/main.c @@ -5,7 +5,7 @@ /*- * Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, - * 2011, 2012, 2013, 2014 + * 2011, 2012, 2013, 2014, 2015 * Thorsten Glaser * * Provided that these terms and disclaimer and all copyright notices @@ -34,7 +34,7 @@ #include #endif -__RCSID("$MirOS: src/bin/mksh/main.c,v 1.287 2015/02/13 12:51:31 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/main.c,v 1.288 2015/03/08 21:30:21 tg Exp $"); extern char **environ; @@ -81,7 +81,7 @@ static const char *initcoms[] = { "history=fc -l", "nameref=typeset -n", "nohup=nohup ", - Tr_fc_e_dash, + "r=fc -e -", "source=PATH=$PATH:. command .", "login=exec login", NULL, diff --git a/sh.h b/sh.h index adf3792..47ca04c 100644 --- a/sh.h +++ b/sh.h @@ -169,7 +169,7 @@ #endif #ifdef EXTERN -__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.715 2015/03/07 20:46:30 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.716 2015/03/08 21:30:22 tg Exp $"); #endif #define MKSH_VERSION "R50 2015/03/07" @@ -802,9 +802,6 @@ EXTERN const char Toomem[] E_INIT("can't allocate %zu data bytes"); EXTERN const char Tsynerr[] E_INIT("syntax error"); #endif EXTERN const char Tselect[] E_INIT("select"); -EXTERN const char Tr_fc_e_dash[] E_INIT("r=fc -e -"); -#define Tfc_e_dash (Tr_fc_e_dash + 2) /* "fc -e -" */ -#define Zfc_e_dash 7 /* strlen(Tfc_e_dash) */ EXTERN const char Tlocal_typeset[] E_INIT("local=typeset"); #define T_typeset (Tlocal_typeset + 5) /* "=typeset" */ #define Ttypeset (Tlocal_typeset + 6) /* "typeset" */ @@ -812,8 +809,6 @@ EXTERN const char Talias[] E_INIT("alias"); EXTERN const char Tunalias[] E_INIT("unalias"); EXTERN const char Tsgset[] E_INIT("*=set"); #define Tset (Tsgset + 2) /* "set" */ -EXTERN const char Tsgunset[] E_INIT("*=unset"); -#define Tunset (Tsgunset + 2) /* "unset" */ EXTERN const char Tsgexport[] E_INIT("*=export"); #define Texport (Tsgexport + 2) /* "export" */ EXTERN const char Tsgreadonly[] E_INIT("*=readonly");