Changeset 2301 for trunk/src


Ignore:
Timestamp:
Mar 1, 2009, 6:37:11 AM (16 years ago)
Author:
bird
Message:

kash: Removed the SH_PURE_STUB_MODE code.

Location:
trunk/src/kash
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/kash/shfile.c

    r2298 r2301  
    2525 */
    2626
     27/*******************************************************************************
     28*   Header Files                                                               *
     29*******************************************************************************/
    2730#include "shfile.h"
    2831#include "shinstance.h" /* TRACE2 */
    … …  
    5053 * Whether the file descriptor table stuff is actually in use or not.
    5154 */
    52 #if !defined(SH_PURE_STUB_MODE) \
    53  && (   K_OS == K_OS_WINDOWS \
    54      || (   !defined(SH_STUB_MODE) \
    55          && !defined(SH_FORKED_MODE)) \
    56     )
     55#if K_OS == K_OS_WINDOWS \
     56 || (   !defined(SH_STUB_MODE) \
     57     && !defined(SH_FORKED_MODE))
    5758# define SHFILE_IN_USE
    5859#endif
    … …  
    599600# endif /* K_OS != K_OS_WINDOWS */
    600601
    601 #elif defined(SH_PURE_STUB_MODE)
    602     fd = -1;
    603     errno = ENOSYS;
    604 
    605602#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    606603    fd = open(name, flags, mode);
    … …  
    684681    }
    685682
    686 #elif defined(SH_PURE_STUB_MODE)
    687     rc = -1;
    688     errno = ENOSYS;
    689 
    690683#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    691684# ifdef _MSC_VER
    … …  
    703696{
    704697    int rc;
    705 #ifdef SH_PURE_STUB_MODE
    706     rc = -1;
    707 
    708 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     698#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    709699    rc = dup(fd);
    710700
    … …  
    738728    else
    739729        rc = -1;
    740 
    741 #elif defined(SH_PURE_STUB_MODE)
    742     rc = -1;
    743730
    744731#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    … …  
    776763        rc = -1;
    777764
    778 #elif defined(SH_PURE_STUB_MODE)
    779     rc = -1;
    780 
    781765#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    782766# ifdef _MSC_VER
    … …  
    814798    else
    815799        rc = -1;
    816 
    817 #elif defined(SH_PURE_STUB_MODE)
    818     rc = -1;
    819800
    820801#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    … …  
    854835    else
    855836        rc = -1;
    856 
    857 #elif defined(SH_PURE_STUB_MODE)
    858     rc = -1;
    859837
    860838#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    … …  
    940918    else
    941919        rc = -1;
    942 
    943 #elif defined(SH_PURE_STUB_MODE)
    944     rc = -1;
    945920
    946921#elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    … …  
    1013988int shfile_stat(shfdtab *pfdtab, const char *path, struct stat *pst)
    1014989{
    1015 #ifdef SH_PURE_STUB_MODE
    1016     return -1;
    1017 
    1018 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     990#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    1019991    return stat(path, pst);
    1020992
    … …  
    1025997int shfile_lstat(shfdtab *pfdtab, const char *link, struct stat *pst)
    1026998{
    1027 #ifdef SH_PURE_STUB_MODE
    1028     return -1;
    1029 
    1030 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     999#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    10311000# ifdef _MSC_VER
    10321001    return stat(link, pst);
    … …  
    10411010int shfile_chdir(shfdtab *pfdtab, const char *path)
    10421011{
    1043 #ifdef SH_PURE_STUB_MODE
    1044     return -1;
    1045 
    1046 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     1012#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    10471013# ifdef _MSC_VER //???
    10481014    return chdir(path);
    … …  
    10571023char *shfile_getcwd(shfdtab *pfdtab, char *buf, int len)
    10581024{
    1059 #ifdef SH_PURE_STUB_MODE
    1060     return NULL;
    1061 
    1062 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     1025#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    10631026    return getcwd(buf, len);
    10641027
    … …  
    10691032int shfile_access(shfdtab *pfdtab, const char *path, int type)
    10701033{
    1071 #ifdef SH_PURE_STUB_MODE
    1072     return -1;
    1073 
    1074 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     1034#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    10751035# ifdef _MSC_VER
    10761036    type &= ~X_OK;
    … …  
    10881048    int rc;
    10891049
    1090 #ifdef SH_PURE_STUB_MODE
    1091     rc = 0;
    1092 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     1050#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    10931051    rc = isatty(fd);
    10941052#else
    … …  
    11041062    int rc;
    11051063
    1106 #ifdef SH_PURE_STUB_MODE
    1107     rc = -1;
    1108 
    1109 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     1064#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    11101065# ifdef _MSC_VER
    11111066    errno = ENOSYS;
    … …  
    11281083    int rc;
    11291084
    1130 #ifdef SH_PURE_STUB_MODE
    1131     rc = -1;
    1132 
    1133 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     1085#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    11341086# ifdef _MSC_VER
    11351087    errno = ENOSYS;
    … …  
    11491101mode_t shfile_get_umask(shfdtab *pfdtab)
    11501102{
    1151 #ifdef SH_PURE_STUB_MODE
     1103#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    11521104    return 022;
    11531105
    1154 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    1155     return 022;
    1156 
    11571106#else
    11581107#endif
    … …  
    11671116shdir *shfile_opendir(shfdtab *pfdtab, const char *dir)
    11681117{
    1169 #ifdef SH_PURE_STUB_MODE
    1170     return NULL;
    1171 
    1172 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     1118#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    11731119# ifdef _MSC_VER
    11741120    errno = ENOSYS;
    … …  
    11841130shdirent *shfile_readdir(struct shdir *pdir)
    11851131{
    1186 #ifdef SH_PURE_STUB_MODE
    1187     return NULL;
    1188 
    1189 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     1132#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    11901133# ifdef _MSC_VER
    11911134    errno = ENOSYS;
    … …  
    12021145void shfile_closedir(struct shdir *pdir)
    12031146{
    1204 #ifdef SH_PURE_STUB_MODE
    1205     return NULL;
    1206 
    1207 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     1147#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    12081148# ifdef _MSC_VER
    12091149    errno = ENOSYS;

  • trunk/src/kash/shinstance.c

    r2300 r2301  
    264264            else
    265265            {
    266 #if defined(SH_PURE_STUB_MODE) || defined(_MSC_VER)
     266#if defined(_MSC_VER)
    267267                sh_sigemptyset(&psh->sigmask);
    268268#else
    … …  
    529529    }
    530530
    531 #ifdef SH_PURE_STUB_MODE
    532     return -1;
    533 #else
    534 
    535531    /*
    536532     * Make sure our data is correct.
    … …  
    596592        TRACE2((psh, "sh_sigaction: setting signo=%d:%s to {.sa_handler=%p, .sa_flags=%#x}\n",
    597593                    signo, sys_signame[signo], g_sig_state[signo].sa.sa_handler, g_sig_state[signo].sa.sa_flags));
    598 # ifdef _MSC_VER
     594#ifdef _MSC_VER
    599595        if (signal(signo, g_sig_state[signo].sa.sa_handler) == SIG_ERR)
    600 # else
     596#else
    601597        if (sigaction(signo, &g_sig_state[signo].sa, NULL))
    602 # endif
     598#endif
    603599            assert(0);
    604600
    … …  
    607603
    608604    return 0;
    609 #endif
    610605}
    611606
    … …  
    803798     * Some other process, call kill where possible
    804799     */
    805 #ifdef SH_PURE_STUB_MODE
    806     rc = -1;
    807 
    808 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     800#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    809801# ifdef _MSC_VER
    810802    errno = ENOSYS;
    … …  
    826818    int rc;
    827819
    828 #ifdef SH_PURE_STUB_MODE
    829     rc = -1;
    830 
    831 #elif defined(SH_STUB_MODE)
     820#if defined(SH_STUB_MODE)
    832821# ifdef _MSC_VER
    833822    errno = ENOSYS;
    … …  
    848837clock_t sh_times(shinstance *psh, shtms *tmsp)
    849838{
    850 #ifdef SH_PURE_STUB_MODE
    851     return 0;
    852 
    853 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     839#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    854840    (void)psh;
    855841# ifdef _MSC_VER
    … …  
    866852int sh_sysconf_clk_tck(void)
    867853{
    868 #ifdef SH_PURE_STUB_MODE
    869     return 1;
    870 #else
    871 # ifdef _MSC_VER
     854#ifdef _MSC_VER
    872855    return CLK_TCK;
    873 # else
     856#else
    874857    return sysconf(_SC_CLK_TCK);
    875 # endif
    876858#endif
    877859}
    … …  
    917899    TRACE2((psh, "sh_fork\n"));
    918900
    919 #ifdef SH_PURE_STUB_MODE
    920     pid = -1;
    921 
    922 #elif K_OS == K_OS_WINDOWS //&& defined(SH_FORKED_MODE)
     901#if K_OS == K_OS_WINDOWS //&& defined(SH_FORKED_MODE)
    923902    pid = shfork_do_it(psh);
    924903
    … …  
    952931{
    953932    pid_t pidret;
    954 #ifdef SH_PURE_STUB_MODE
    955     *statusp = 0;
    956     pidret = -1;
    957 
    958 #elif K_OS == K_OS_WINDOWS //&& defined(SH_FORKED_MODE)
     933#if K_OS == K_OS_WINDOWS //&& defined(SH_FORKED_MODE)
    959934    DWORD   dwRet;
    960935    HANDLE  hChild = INVALID_HANDLE_VALUE;
    … …  
    10711046    (void)psh;
    10721047
    1073 #ifdef SH_PURE_STUB_MODE
    1074     return -1;
    1075 
    1076 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     1048#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    10771049    _exit(rc);
    10781050
    … …  
    10991071        envp = sh_environ(psh);
    11001072
    1101 #ifdef SH_PURE_STUB_MODE
    1102     rc = -1;
    1103 
    1104 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     1073#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    11051074    errno = 0;
    11061075# ifdef _MSC_VER
    … …  
    11261095uid_t sh_getuid(shinstance *psh)
    11271096{
    1128 #ifdef SH_PURE_STUB_MODE
     1097#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     1098# ifdef _MSC_VER
    11291099    uid_t uid = 0;
    1130 
    1131 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    1132 # ifdef _MSC_VER
    1133     uid_t uid = 0;
    11341100# else
    11351101    uid_t uid = getuid();
    … …  
    11461112uid_t sh_geteuid(shinstance *psh)
    11471113{
    1148 #ifdef SH_PURE_STUB_MODE
     1114#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     1115# ifdef _MSC_VER
    11491116    uid_t euid = 0;
    1150 
    1151 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    1152 # ifdef _MSC_VER
    1153     uid_t euid = 0;
    11541117# else
    11551118    uid_t euid = geteuid();
    … …  
    11661129gid_t sh_getgid(shinstance *psh)
    11671130{
    1168 #ifdef SH_PURE_STUB_MODE
     1131#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     1132# ifdef _MSC_VER
    11691133    gid_t gid = 0;
    1170 
    1171 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    1172 # ifdef _MSC_VER
    1173     gid_t gid = 0;
    11741134# else
    11751135    gid_t gid = getgid();
    … …  
    11861146gid_t sh_getegid(shinstance *psh)
    11871147{
    1188 #ifdef SH_PURE_STUB_MODE
     1148#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     1149# ifdef _MSC_VER
    11891150    gid_t egid = 0;
    1190 
    1191 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    1192 # ifdef _MSC_VER
    1193     gid_t egid = 0;
    11941151# else
    11951152    gid_t egid = getegid();
    … …  
    12081165    pid_t pid;
    12091166
    1210 #ifdef SH_PURE_STUB_MODE
    1211     pid = 0;
    1212 
    1213 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     1167#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    12141168# ifdef _MSC_VER
    12151169    pid = _getpid();
    … …  
    12261180pid_t sh_getpgrp(shinstance *psh)
    12271181{
    1228 #ifdef SH_PURE_STUB_MODE
    1229     pid_t pgrp = 0;
    1230 
    1231 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     1182#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    12321183# ifdef _MSC_VER
    12331184    pid_t pgrp = _getpid();
    … …  
    12461197pid_t sh_getpgid(shinstance *psh, pid_t pid)
    12471198{
    1248 #ifdef SH_PURE_STUB_MODE
     1199#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     1200# ifdef _MSC_VER
    12491201    pid_t pgid = pid;
    1250 
    1251 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    1252 # ifdef _MSC_VER
    1253     pid_t pgid = pid;
    12541202# else
    12551203    pid_t pgid = getpgid(pid);
    … …  
    12661214int sh_setpgid(shinstance *psh, pid_t pid, pid_t pgid)
    12671215{
    1268 #ifdef SH_PURE_STUB_MODE
    1269     int rc = -1;
    1270 
    1271 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     1216#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    12721217# ifdef _MSC_VER
    12731218    int rc = -1;
    … …  
    12891234    pid_t pgrp;
    12901235
    1291 #ifdef SH_PURE_STUB_MODE
    1292     pgrp = -1;
    1293 
    1294 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     1236#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    12951237# ifdef _MSC_VER
    12961238    pgrp = -1;
    … …  
    13131255    TRACE2((psh, "sh_tcsetpgrp(%d, %d)\n", fd, pgrp));
    13141256
    1315 #ifdef SH_PURE_STUB_MODE
    1316     rc = -1;
    1317 
    1318 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     1257#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    13191258# ifdef _MSC_VER
    13201259    rc = -1;
    … …  
    13341273int sh_getrlimit(shinstance *psh, int resid, shrlimit *limp)
    13351274{
    1336 #ifdef SH_PURE_STUB_MODE
    1337     int rc = -1;
    1338 
    1339 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     1275#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    13401276# ifdef _MSC_VER
    13411277    int rc = -1;
    … …  
    13571293int sh_setrlimit(shinstance *psh, int resid, const shrlimit *limp)
    13581294{
    1359 #ifdef SH_PURE_STUB_MODE
    1360     int rc = -1;
    1361 
    1362 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
     1295#if defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
    13631296# ifdef _MSC_VER
    13641297    int rc = -1;
Note: See TracChangeset for help on using the changeset viewer.