From 0e3b868b15beefe33d211ebfbdb0fb1bc6f835a8 Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Sat, 8 Jul 2023 09:32:39 +0200 Subject: [PATCH] [fsp2] Compilation fixes for dos --- src/protocol/fsp/fsp2.c | 13 ++----------- src/protocol/fsp/fsplib.h | 5 +++-- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/protocol/fsp/fsp2.c b/src/protocol/fsp/fsp2.c index 8e77ce74..1fdef7a6 100644 --- a/src/protocol/fsp/fsp2.c +++ b/src/protocol/fsp/fsp2.c @@ -676,14 +676,6 @@ fsp_fopen(struct connection *conn, const char *path, const char *modeflags) switch (*modeflags++) { case 'r': break; -// case 'w': -// f->writing = 1; -// break; - case 'a': - /* not supported */ - free(f); - errno = ENOTSUP; - return NULL; default: free(f); errno = EINVAL; @@ -692,7 +684,6 @@ fsp_fopen(struct connection *conn, const char *path, const char *modeflags) if (*modeflags == '+' || ( *modeflags == 'b' && modeflags[1] == '+')) { free(f); - errno = ENOTSUP; return NULL; } @@ -781,7 +772,7 @@ fsp_stat_continue(void *data) } if (fsp->in.cmd == FSP_CC_ERR) { - errno = ENOTSUP; + errno = ENOENT; abort_connection(conn, connection_state_for_errno(errno)); return; } @@ -796,7 +787,7 @@ fsp_stat_continue(void *data) fsp->sb.st_uid = fsp->sb.st_gid = 0; fsp->sb.st_mtime = fsp->sb.st_ctime = fsp->sb.st_atime = ntohl(*(const uint32_t *)(fsp->in.buf)); fsp->sb.st_size = ntohl(*(const uint32_t *)(fsp->in.buf + 4)); - fsp->sb.st_blocks = (fsp->sb.st_size + 511) / 512; + //fsp->sb.st_blocks = (fsp->sb.st_size + 511) / 512; if (ftype == FSP_RDTYPE_DIR) { fsp->sb.st_mode = S_IFDIR | 0755; diff --git a/src/protocol/fsp/fsplib.h b/src/protocol/fsp/fsplib.h index 4eaa3543..f2e15227 100644 --- a/src/protocol/fsp/fsplib.h +++ b/src/protocol/fsp/fsplib.h @@ -143,10 +143,11 @@ typedef struct FSP_FILE { unsigned int pos; /* position of next packet */ } FSP_FILE; - +#if 0 typedef union dirent_workaround { struct dirent dirent; char fill[offsetof (struct dirent, d_name) + MAXNAMLEN + 1]; } dirent_workaround; - +#endif + #endif