diff options
Diffstat (limited to 'Src/Modules')
| -rw-r--r-- | Src/Modules/parameter.c | 8 | ||||
| -rw-r--r-- | Src/Modules/stat.c | 39 | ||||
| -rw-r--r-- | Src/Modules/zftp.c | 6 |
3 files changed, 38 insertions, 15 deletions
diff --git a/Src/Modules/parameter.c b/Src/Modules/parameter.c index 6e19a377e..e023ca9fe 100644 --- a/Src/Modules/parameter.c +++ b/Src/Modules/parameter.c @@ -200,7 +200,7 @@ setpmcommand(Param pm, char *value) zwarn("restricted: %s", value, 0); zsfree(value); } else { - Cmdnam cn = zcalloc(sizeof(*cn)); + Cmdnam cn = zshcalloc(sizeof(*cn)); cn->flags = HASHED; cn->u.cmd = value; @@ -231,7 +231,7 @@ setpmcommands(Param pm, HashTable ht) for (i = 0; i < ht->hsize; i++) for (hn = ht->nodes[i]; hn; hn = hn->next) { - Cmdnam cn = zcalloc(sizeof(*cn)); + Cmdnam cn = zshcalloc(sizeof(*cn)); struct value v; v.isarr = v.inv = v.start = 0; @@ -1417,7 +1417,7 @@ setpmnameddir(Param pm, char *value) if (!value) zwarn("invalid value: ''", NULL, 0); else { - Nameddir nd = (Nameddir) zcalloc(sizeof(*nd)); + Nameddir nd = (Nameddir) zshcalloc(sizeof(*nd)); nd->flags = 0; nd->dir = value; @@ -1466,7 +1466,7 @@ setpmnameddirs(Param pm, HashTable ht) if (!(val = getstrvalue(&v))) zwarn("invalid value: ''", NULL, 0); else { - Nameddir nd = (Nameddir) zcalloc(sizeof(*nd)); + Nameddir nd = (Nameddir) zshcalloc(sizeof(*nd)); nd->flags = 0; nd->dir = ztrdup(val); diff --git a/Src/Modules/stat.c b/Src/Modules/stat.c index ab4316f7b..10f7e5c9b 100644 --- a/Src/Modules/stat.c +++ b/Src/Modules/stat.c @@ -35,7 +35,7 @@ enum statnum { ST_DEV, ST_INO, ST_MODE, ST_NLINK, ST_UID, ST_GID, ST_BLKSIZE, ST_BLOCKS, ST_READLINK, ST_COUNT }; enum statflags { STF_NAME = 1, STF_FILE = 2, STF_STRING = 4, STF_RAW = 8, STF_PICK = 16, STF_ARRAY = 32, STF_GMT = 64, - STF_HASH = 128 }; + STF_HASH = 128, STF_OCTAL = 256 }; static char *statelts[] = { "device", "inode", "mode", "nlink", "uid", "gid", "rdev", "size", "atime", "mtime", "ctime", "blksize", "blocks", @@ -47,19 +47,40 @@ static void statmodeprint(mode_t mode, char *outbuf, int flags) { if (flags & STF_RAW) { - sprintf(outbuf, "%lu", (unsigned long)mode); + sprintf(outbuf, (flags & STF_OCTAL) ? "0%lo" : "%lu", + (unsigned long)mode); if (flags & STF_STRING) strcat(outbuf, " ("); } if (flags & STF_STRING) { static const char *modes = "?rwxrwxrwx"; - static const mode_t mflags[] = { S_IRUSR, S_IWUSR, S_IXUSR, - S_IRGRP, S_IWGRP, S_IXGRP, - S_IROTH, S_IWOTH, S_IXOTH }; +#ifdef __CYGWIN__ + static mode_t mflags[9] = { 0 }; +#else + static const mode_t mflags[9] = { + S_IRUSR, S_IWUSR, S_IXUSR, + S_IRGRP, S_IWGRP, S_IXGRP, + S_IROTH, S_IWOTH, S_IXOTH + }; +#endif const mode_t *mfp = mflags; char pm[11]; int i; +#ifdef __CYGWIN__ + if (mflags[0] == 0) { + mflags[0] = S_IRUSR; + mflags[1] = S_IWUSR; + mflags[2] = S_IXUSR; + mflags[3] = S_IRGRP; + mflags[4] = S_IWGRP; + mflags[5] = S_IXGRP; + mflags[6] = S_IROTH; + mflags[7] = S_IWOTH; + mflags[8] = S_IXOTH; + } +#endif + if (S_ISBLK(mode)) *pm = 'b'; else if (S_ISCHR(mode)) @@ -359,7 +380,7 @@ bin_stat(char *name, char **args, char *ops, int func) flags |= STF_PICK; } else { for (; *arg; arg++) { - if (strchr("glLnNrstT", *arg)) + if (strchr("glLnNorstT", *arg)) ops[STOUC(*arg)] = 1; else if (*arg == 'A') { if (arg[1]) { @@ -472,6 +493,8 @@ bin_stat(char *name, char **args, char *ops, int func) flags |= STF_RAW; if (ops['n']) flags |= STF_FILE; + if (ops['o']) + flags |= STF_OCTAL; if (ops['t']) flags |= STF_NAME; @@ -495,7 +518,7 @@ bin_stat(char *name, char **args, char *ops, int func) arrsize = (flags & STF_PICK) ? 1 : ST_COUNT; if (flags & STF_FILE) arrsize++; - hashptr = hash = (char **)zcalloc((arrsize+1)*2*sizeof(char *)); + hashptr = hash = (char **)zshcalloc((arrsize+1)*2*sizeof(char *)); } if (arrnam) { @@ -503,7 +526,7 @@ bin_stat(char *name, char **args, char *ops, int func) if (flags & STF_FILE) arrsize++; arrsize *= nargs; - arrptr = array = (char **)zcalloc((arrsize+1)*sizeof(char *)); + arrptr = array = (char **)zshcalloc((arrsize+1)*sizeof(char *)); } for (; ops['f'] || *args; args++) { diff --git a/Src/Modules/zftp.c b/Src/Modules/zftp.c index 29ae98de5..081c6e2e2 100644 --- a/Src/Modules/zftp.c +++ b/Src/Modules/zftp.c @@ -2222,7 +2222,7 @@ zftp_params(char *name, char **args, int flags) return 0; } len = arrlen(args); - newarr = (char **)zcalloc((len+1)*sizeof(char *)); + newarr = (char **)zshcalloc((len+1)*sizeof(char *)); for (aptr = args, i = 0; *aptr && !errflag; aptr++, i++) { char *str; if (**aptr == '?') @@ -2935,10 +2935,10 @@ newsession(char *nm) } if (!nptr) { - zfsess = (Zftp_session) zcalloc(sizeof(struct zftp_session)); + zfsess = (Zftp_session) zshcalloc(sizeof(struct zftp_session)); zfsess->name = ztrdup(nm); zfsess->cfd = zfsess->dfd = -1; - zfsess->params = (char **) zcalloc(sizeof(zfparams)); + zfsess->params = (char **) zshcalloc(sizeof(zfparams)); zaddlinknode(zfsessions, zfsess); zfsesscnt++; |