diff --git a/base/alloc.h b/base/alloc.h index 3670b69..aa63eb6 100644 --- a/base/alloc.h +++ b/base/alloc.h @@ -1,5 +1,8 @@ /* * $Log: alloc.h,v $ + * Revision 1.6 2025-01-21 22:18:20+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.5 2024-05-12 00:10:20+05:30 mbhangui * fix function prototypes * @@ -19,14 +22,6 @@ /* @null@ *//* @out@ */ void *alloc(unsigned int); void alloc_free(char *); -#ifdef _ALLOC_ -#ifdef __APPLE__ int alloc_re(void **, unsigned int, unsigned int); -#else -int alloc_re(); -#endif -#else -int alloc_re(void *, unsigned int, unsigned int); -#endif #endif diff --git a/base/alloc_re.c b/base/alloc_re.c index 2f4b0e9..c0f21c3 100644 --- a/base/alloc_re.c +++ b/base/alloc_re.c @@ -1,5 +1,8 @@ /* * $Log: alloc_re.c,v $ + * Revision 1.10 2025-01-21 22:18:34+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.9 2024-05-09 23:46:19+05:30 mbhangui * fix discarded-qualifier compiler warnings * @@ -22,9 +25,7 @@ * added RCS log * */ -#define _ALLOC_ #include "alloc.h" -#undef _ALLOC_ #include "byte.h" int @@ -46,7 +47,7 @@ alloc_re(void **x, unsigned int old_size, unsigned int new_size) void getversion_alloc_re_c() { - const char *x = "$Id: alloc_re.c,v 1.9 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: alloc_re.c,v 1.10 2025-01-21 22:18:34+05:30 Cprogrammer Exp mbhangui $"; x++; } diff --git a/base/allwrite.c b/base/allwrite.c index 1827125..ab4e555 100644 --- a/base/allwrite.c +++ b/base/allwrite.c @@ -1,12 +1,12 @@ /* - * $Id: allwrite.c,v 1.2 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $ + * $Id: allwrite.c,v 1.3 2025-01-21 22:18:44+05:30 Cprogrammer Exp mbhangui $ */ #include #include #include "error.h" ssize_t -allwrite(int fd, char *buf, size_t len) +allwrite(int fd, const char *buf, size_t len) { ssize_t w; size_t total = 0; @@ -29,13 +29,16 @@ allwrite(int fd, char *buf, size_t len) void getversion_allwrite_c() { - const char *x = "$Id: allwrite.c,v 1.2 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: allwrite.c,v 1.3 2025-01-21 22:18:44+05:30 Cprogrammer Exp mbhangui $"; x++; } /* * $Log: allwrite.c,v $ + * Revision 1.3 2025-01-21 22:18:44+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.2 2024-05-09 23:46:19+05:30 mbhangui * fix discarded-qualifier compiler warnings * diff --git a/base/allwrite.h b/base/allwrite.h index 9f8026a..b1d26ef 100644 --- a/base/allwrite.h +++ b/base/allwrite.h @@ -1,5 +1,8 @@ /* * $Log: allwrite.h,v $ + * Revision 1.2 2025-01-21 22:18:48+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.1 2023-01-02 19:47:23+05:30 Cprogrammer * Initial revision * @@ -8,5 +11,5 @@ #define _ALLWRITE_H #include -ssize_t allwrite(int, char *, size_t); +ssize_t allwrite(int, const char *, size_t); #endif diff --git a/base/buffer.c b/base/buffer.c index a769b69..fc37147 100644 --- a/base/buffer.c +++ b/base/buffer.c @@ -1,5 +1,5 @@ /* - * $Id: buffer.c,v 1.2 2024-05-12 00:10:20+05:30 mbhangui Exp mbhangui $ + * $Id: buffer.c,v 1.3 2025-01-21 22:18:54+05:30 Cprogrammer Exp mbhangui $ */ #include #include @@ -12,7 +12,7 @@ */ void -buffer_init(buffer *s, ssize_t(*op) (), int fd, char *buf, size_t len) +buffer_init(buffer *s, ssize_t(*op) (int, char *, size_t), int fd, char *buf, size_t len) { s->x = buf; s->fd = fd; @@ -33,8 +33,8 @@ char buffer_0_space[BUFFER_INSIZE]; char buffer_1_space[BUFFER_OUTSIZE]; char buffer_2_space[BUFFER_OUTSIZE]; static buffer it0 = BUFFER_INIT(buffer_0_read, 0, buffer_0_space, sizeof (buffer_0_space)); -static buffer it1 = BUFFER_INIT(write, 1, buffer_1_space, sizeof (buffer_1_space)); -static buffer it2 = BUFFER_INIT(write, 2, buffer_2_space, sizeof (buffer_2_space)); +static buffer it1 = BUFFER_INIT((ssize_t (*)(int, char *, size_t)) write, 1, buffer_1_space, sizeof (buffer_1_space)); +static buffer it2 = BUFFER_INIT((ssize_t (*)(int, char *, size_t)) write, 2, buffer_2_space, sizeof (buffer_2_space)); buffer *buffer_0 = &it0; buffer *buffer_1 = &it1; @@ -45,8 +45,8 @@ char buffer_1_small[BUFFER_SMALL]; char buffer_2_small[BUFFER_SMALL]; static buffer is0 = BUFFER_INIT(buffer_0_read, 0, buffer_0_small, sizeof (buffer_0_small)); -static buffer is1 = BUFFER_INIT(write, 1, buffer_1_small, sizeof (buffer_1_small)); -static buffer is2 = BUFFER_INIT(write, 2, buffer_2_small, sizeof (buffer_2_small)); +static buffer is1 = BUFFER_INIT((ssize_t (*)(int, char *, size_t)) write, 1, buffer_1_small, sizeof (buffer_1_small)); +static buffer is2 = BUFFER_INIT((ssize_t (*)(int, char *, size_t)) write, 2, buffer_2_small, sizeof (buffer_2_small)); buffer *buffer_0small = &is0; buffer *buffer_1small = &is1; @@ -198,7 +198,7 @@ buffer_flush(buffer *s) if (!(p = s->p)) return 0; s->p = 0; - return allwrite(s->op, s->fd, s->x, p); + return allwrite((ssize_t (*)(int, const char *, size_t)) s->op, s->fd, s->x, p); } int @@ -235,7 +235,7 @@ buffer_put(buffer *s, const char *buf, size_t len) while (len > s->n) { if (n > len) n = len; - if (allwrite(s->op, s->fd, buf, n) == -1) + if (allwrite((ssize_t (*)(int, const char *, size_t)) s->op, s->fd, buf, n) == -1) return -1; buf += n; len -= n; @@ -252,7 +252,7 @@ buffer_putflush(buffer *s, const char *buf, size_t len) { if (buffer_flush(s) == -1) return -1; - return allwrite(s->op, s->fd, buf, len); + return allwrite((ssize_t (*)(int, const char *, size_t)) s->op, s->fd, buf, len); } int @@ -275,6 +275,9 @@ buffer_putsflush(buffer *s, const char *buf) /* * $Log: buffer.c,v $ + * Revision 1.3 2025-01-21 22:18:54+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.2 2024-05-12 00:10:20+05:30 mbhangui * fix function prototypes * diff --git a/base/buffer.h b/base/buffer.h index 3fb653d..9529199 100644 --- a/base/buffer.h +++ b/base/buffer.h @@ -1,17 +1,17 @@ /* - * $Id: buffer.h,v 1.2 2024-05-12 00:10:20+05:30 mbhangui Exp mbhangui $ + * $Id: buffer.h,v 1.3 2025-01-21 22:18:59+05:30 Cprogrammer Exp mbhangui $ */ #ifndef BUFFER_H #define BUFFER_H -#include /* need type: ssize_t */ +#include /* need type: ssize_t */ typedef struct buffer { char *x; unsigned int p; size_t n; int fd; - ssize_t(*op) (); + ssize_t (*op) (int, char *, size_t); } buffer; #define BUFFER_INIT(op,fd,buf,len) { (buf), 0, (len), (fd), (op) } @@ -19,7 +19,7 @@ typedef struct buffer { #define BUFFER_INSIZE 8192 #define BUFFER_OUTSIZE 8192 -extern void buffer_init(buffer *, ssize_t(*op) (), int, char *, size_t); +extern void buffer_init(buffer *, ssize_t(*op) (int, char *, size_t), int, char *, size_t); extern int buffer_flush(buffer *); extern void buffer_discard(buffer *); extern int buffer_put(buffer *, const char *, size_t); diff --git a/base/cdb_make.c b/base/cdb_make.c index 7425670..cb0d66e 100644 --- a/base/cdb_make.c +++ b/base/cdb_make.c @@ -1,5 +1,8 @@ /* * $Log: cdb_make.c,v $ + * Revision 1.4 2025-01-21 22:19:04+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.3 2024-05-09 23:46:19+05:30 mbhangui * fix discarded-qualifier compiler warnings * @@ -27,7 +30,7 @@ cdb_make_start(struct cdb_make *c, int fd) c->numentries = 0; c->fd = fd; c->pos = sizeof c->final; - substdio_fdbuf(&c->b, write, fd, c->bspace, sizeof c->bspace); + substdio_fdbuf(&c->b, (ssize_t (*)(int, char *, size_t)) write, fd, c->bspace, sizeof c->bspace); return seek_set(fd, c->pos); } @@ -197,7 +200,7 @@ cdb_make_finish(struct cdb_make *c) void getversion_cdb_make_c() { - const char *x = "$Id: cdb_make.c,v 1.3 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: cdb_make.c,v 1.4 2025-01-21 22:19:04+05:30 Cprogrammer Exp mbhangui $"; x++; } diff --git a/base/cdbmake.h b/base/cdbmake.h index 9590646..501f5ed 100644 --- a/base/cdbmake.h +++ b/base/cdbmake.h @@ -1,5 +1,8 @@ /* * $Log: cdbmake.h,v $ + * Revision 1.5 2025-01-21 22:19:08+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.4 2020-12-02 14:51:07+05:30 Cprogrammer * changed return type of alloc() to void * * @@ -45,8 +48,8 @@ struct cdbmake void cdbmake_pack(unsigned char *, uint32); uint32 cdbmake_hashadd(uint32, unsigned int); void cdbmake_init(struct cdbmake *); -int cdbmake_add(struct cdbmake *, uint32, uint32, void *(*alloc)()); -int cdbmake_split(struct cdbmake *, void *(*alloc)()); +int cdbmake_add(struct cdbmake *, uint32, uint32, void *(*alloc)(unsigned int)); +int cdbmake_split(struct cdbmake *, void *(*alloc)(unsigned int)); uint32 cdbmake_throw(struct cdbmake *, uint32, int); #endif diff --git a/base/cdbmss.c b/base/cdbmss.c index e399583..4f839c1 100644 --- a/base/cdbmss.c +++ b/base/cdbmss.c @@ -1,5 +1,8 @@ /* * $Log: cdbmss.c,v $ + * Revision 1.8 2025-01-21 22:19:11+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.7 2024-05-09 23:46:19+05:30 mbhangui * fix discarded-qualifier compiler warnings * @@ -30,7 +33,7 @@ cdbmss_start(struct cdbmss *c, int fd) cdbmake_init(&c->cdbm); c->fd = fd; c->pos = sizeof(c->cdbm.final); - substdio_fdbuf(&c->ss, write, fd, c->ssbuf, sizeof(c->ssbuf)); + substdio_fdbuf(&c->ss, (ssize_t (*)(int, char *, size_t)) write, fd, c->ssbuf, sizeof(c->ssbuf)); return seek_set(fd, (seek_pos) c->pos); } @@ -85,7 +88,7 @@ cdbmss_finish(struct cdbmss *c) void getversion_cdbmss_c() { - const char *x = "$Id: cdbmss.c,v 1.7 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: cdbmss.c,v 1.8 2025-01-21 22:19:11+05:30 Cprogrammer Exp mbhangui $"; x++; } diff --git a/base/env.c b/base/env.c index a30691f..e3b211c 100644 --- a/base/env.c +++ b/base/env.c @@ -1,5 +1,8 @@ /* * $Log: env.c,v $ + * Revision 1.12 2025-01-21 22:19:14+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.11 2024-05-12 00:10:20+05:30 mbhangui * fix function prototypes * @@ -115,7 +118,7 @@ env_add(const char *s) * no overflow check for en +1 as it would have succeeded in an * earlier call to alloc() */ - if (!alloc_re((char *) &environ, (en + 1) * sizeof(char *), i * sizeof(char *))) { + if (!alloc_re((void **) &environ, (en + 1) * sizeof(char *), i * sizeof(char *))) { ea = en; return 0; } @@ -233,7 +236,7 @@ restore_env() void getversion_env_c() { - const char *x = "$Id: env.c,v 1.11 2024-05-12 00:10:20+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: env.c,v 1.12 2025-01-21 22:19:14+05:30 Cprogrammer Exp mbhangui $"; x++; } diff --git a/base/envdir.c b/base/envdir.c index 0aecd30..be42b9c 100644 --- a/base/envdir.c +++ b/base/envdir.c @@ -1,5 +1,5 @@ /* - * $Id: envdir.c,v 1.16 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $ + * $Id: envdir.c,v 1.17 2025-01-21 22:19:20+05:30 Cprogrammer Exp mbhangui $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -62,7 +62,7 @@ if_visited(ino_t inum) if (ino_ptr[i] == inum) return 1; } - if (!alloc_re(&ino_ptr, sizeof(ino_t) * ino_count, sizeof(ino_t) * (ino_count + 1))) + if (!alloc_re((void **) &ino_ptr, sizeof(ino_t) * ino_count, sizeof(ino_t) * (ino_count + 1))) return -6; /*- out of memory */ } else { if (!(ino_ptr = (ino_t *) alloc(sizeof(ino_t) * (ino_count + 1)))) @@ -302,7 +302,7 @@ envdir(const char *fn, const char **e, int ignore_unreadable, int *unreadable) } if (dt->d_name[0] == '.') continue; - if (!alloc_re(&d, alen, len + str_len(dt->d_name) + 2)) { + if (!alloc_re((void **) &d, alen, len + str_len(dt->d_name) + 2)) { if (e) *e = error_str(errno); exit_nicely(d, dir); @@ -367,13 +367,16 @@ envdir(const char *fn, const char **e, int ignore_unreadable, int *unreadable) void getversion_envdir_c() { - const char *x = "$Id: envdir.c,v 1.16 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: envdir.c,v 1.17 2025-01-21 22:19:20+05:30 Cprogrammer Exp mbhangui $"; x++; } /* * $Log: envdir.c,v $ + * Revision 1.17 2025-01-21 22:19:20+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.16 2024-05-09 23:46:19+05:30 mbhangui * fix discarded-qualifier compiler warnings * diff --git a/base/estack.c b/base/estack.c index c8deb6a..a79704a 100644 --- a/base/estack.c +++ b/base/estack.c @@ -1,5 +1,8 @@ /* * $Log: estack.c,v $ + * Revision 1.3 2025-01-21 22:19:24+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.2 2024-05-09 23:46:19+05:30 mbhangui * fix discarded-qualifier compiler warnings * @@ -41,7 +44,7 @@ estack(int fderr, const char *errorstr) substdio sserr; if (fderr > -1) - substdio_fdbuf(&sserr, write, fderr, sserrbuf, sizeof(sserrbuf)); + substdio_fdbuf(&sserr, (ssize_t (*)(int, char *, size_t)) write, fderr, sserrbuf, sizeof(sserrbuf)); if (errorstr && *errorstr) { len = str_len((char *) errorstr) + 1; /* string + 1 null byte */ if (!(error_store = realloc(error_store, mylen + len + 1))) { /*- The man page is wierd on Mac OS */ @@ -94,6 +97,6 @@ estack(int fderr, const char *errorstr) void getversion_estack_qc() { - const char *x = "$Id: estack.c,v 1.2 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: estack.c,v 1.3 2025-01-21 22:19:24+05:30 Cprogrammer Exp mbhangui $"; x++; /*- No dollar for OSS/FS */ } diff --git a/base/gen_allocdefs.h b/base/gen_allocdefs.h index c1f6c53..4e4ff15 100644 --- a/base/gen_allocdefs.h +++ b/base/gen_allocdefs.h @@ -1,5 +1,8 @@ /* * $Log: gen_allocdefs.h,v $ + * Revision 1.7 2025-01-21 22:19:27+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.6 2020-11-23 17:53:14+05:30 Cprogrammer * fixed compiler warning * @@ -37,7 +40,7 @@ static int ta_rplus ## _internal (ta *x, unsigned int n, unsigned int pluslen) \ if (__builtin_mul_overflow(nnum, sizeof(type), &nlen)) { \ errno = error_nomem; \ return 0; } \ - if (!alloc_re((char *) &x->field,x->a * sizeof(type),nlen)) { \ + if (!alloc_re((void **) &x->field,x->a * sizeof(type),nlen)) { \ errno = error_nomem; \ return 0; } \ x->a = nnum; \ diff --git a/base/mktempfile.c b/base/mktempfile.c index b593562..3ca13b0 100644 --- a/base/mktempfile.c +++ b/base/mktempfile.c @@ -1,5 +1,8 @@ /* * $Log: mktempfile.c,v $ + * Revision 1.3 2025-01-21 22:19:31+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.2 2024-05-09 23:46:19+05:30 mbhangui * fix discarded-qualifier compiler warnings * @@ -40,8 +43,8 @@ mktempfile(int seekfd) if ((fd = open(tmpFile.s, O_RDWR | O_EXCL | O_CREAT, 0600)) == -1) return (-1); unlink(tmpFile.s); - substdio_fdbuf(&ssout, write, fd, outbuf, sizeof (outbuf)); - substdio_fdbuf(&ssin, read, seekfd, inbuf, sizeof (inbuf)); + substdio_fdbuf(&ssout, (ssize_t (*)(int, char *, size_t)) write, fd, outbuf, sizeof (outbuf)); + substdio_fdbuf(&ssin, (ssize_t (*)(int, char *, size_t)) read, seekfd, inbuf, sizeof (inbuf)); switch (substdio_copy(&ssout, &ssin)) { case -2: /*- read error */ @@ -73,7 +76,7 @@ mktempfile(int seekfd) void getversion_mktempfile_c() { - const char *x = "$Id: mktempfile.c,v 1.2 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: mktempfile.c,v 1.3 2025-01-21 22:19:31+05:30 Cprogrammer Exp mbhangui $"; x = sccsidmktempfileh; x++; diff --git a/base/qgetpwgr.c b/base/qgetpwgr.c index 241f85b..ecdd6d1 100644 --- a/base/qgetpwgr.c +++ b/base/qgetpwgr.c @@ -1,5 +1,8 @@ /* * $Log: qgetpwgr.c,v $ + * Revision 1.11 2025-01-21 22:19:37+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.10 2024-05-09 23:46:19+05:30 mbhangui * fix discarded-qualifier compiler warnings * @@ -120,7 +123,7 @@ qpwinit(int flag) } if (!flag) return; - if (!alloc_re(&_pwbuf, sizeof(char) * _pwbuf_len, sizeof(char) * (_pwbuf_len + 512))) { + if (!alloc_re((void **) &_pwbuf, sizeof(char) * _pwbuf_len, sizeof(char) * (_pwbuf_len + 512))) { errno = ENOMEM; return; } @@ -148,7 +151,7 @@ qgetpwent_r(struct passwd *pwd, char *buf, size_t buflen, struct passwd **result if ((pwfd = open_read(ptr)) == -1) return errno; _is_open = 1; - substdio_fdbuf(&pwss, read, pwfd, _pw_inbuf, sizeof (_pw_inbuf)); + substdio_fdbuf(&pwss, (ssize_t (*)(int, char *, size_t)) read, pwfd, _pw_inbuf, sizeof (_pw_inbuf)); } if (set_pwent) { if (pwss.p) @@ -384,7 +387,7 @@ qgrinit(int flag) } if (!flag) return; - if (!alloc_re(&_grbuf, sizeof(char) * _grbuf_len, sizeof(char) * (_grbuf_len + 512))) { + if (!alloc_re((void **) &_grbuf, sizeof(char) * _grbuf_len, sizeof(char) * (_grbuf_len + 512))) { errno = ENOMEM; return; } @@ -412,7 +415,7 @@ qgetgrent_r(struct group *grp, char *buf, size_t buflen, struct group **result) if ((grfd = open_read(ptr)) == -1) return errno; _is_open = 1; - substdio_fdbuf(&grss, read, grfd, _gr_inbuf, sizeof (_gr_inbuf)); + substdio_fdbuf(&grss, (ssize_t (*)(int, char *, size_t)) read, grfd, _gr_inbuf, sizeof (_gr_inbuf)); } if (set_grent) { if (grss.p) { @@ -478,7 +481,7 @@ qgetgrent_r(struct group *grp, char *buf, size_t buflen, struct group **result) if (*x == ',') g++; } - if (!alloc_re(&gr_mem_ptr, sizeof(char *) * gr_mem_len, sizeof(char *) * (g + 1))) + if (!alloc_re((void **) &gr_mem_ptr, sizeof(char *) * gr_mem_len, sizeof(char *) * (g + 1))) return errno; gr_mem_len = g + 1; for (x = y = cptr, i = 0; *x; x++) { @@ -496,7 +499,7 @@ qgetgrent_r(struct group *grp, char *buf, size_t buflen, struct group **result) gr_mem_ptr[i++] = y; gr_mem_ptr[i] = NULL; } else { - if (!alloc_re(&gr_mem_ptr, sizeof(char *) * gr_mem_len, sizeof(char *))) + if (!alloc_re((void **) &gr_mem_ptr, sizeof(char *) * gr_mem_len, sizeof(char *))) return errno; gr_mem_len = 1; gr_mem_ptr[0] = NULL; @@ -664,7 +667,7 @@ qsvinit(int flag) } if (!flag) return; - if (!alloc_re(&_svbuf, sizeof(char) * _svbuf_len, sizeof(char) * (_svbuf_len + 512))) { + if (!alloc_re((void **) &_svbuf, sizeof(char) * _svbuf_len, sizeof(char) * (_svbuf_len + 512))) { errno = ENOMEM; return; } @@ -692,7 +695,7 @@ qgetservent_r(struct servent *svc, char *buf, size_t buflen, struct servent **re if ((svfd = open_read(ptr)) == -1) return errno; _is_open = 1; - substdio_fdbuf(&svss, read, svfd, _sv_inbuf, sizeof (_sv_inbuf)); + substdio_fdbuf(&svss, (ssize_t (*)(int, char *, size_t)) read, svfd, _sv_inbuf, sizeof (_sv_inbuf)); } if (set_svent) { if (svss.p) @@ -794,7 +797,7 @@ qgetservent_r(struct servent *svc, char *buf, size_t buflen, struct servent **re x++; } } - if (!alloc_re(&sv_alias_ptr, sizeof(char *) * sv_alias_len, sizeof(char *) * (s + 1))) + if (!alloc_re((void **) &sv_alias_ptr, sizeof(char *) * sv_alias_len, sizeof(char *) * (s + 1))) return errno; sv_alias_len = s + 1; for (x = y = cptr, i = 0; *x; x++) { @@ -966,7 +969,7 @@ qgetservent() void getversion_qgetpwgr_c() { - const char *x = "$Id: qgetpwgr.c,v 1.10 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: qgetpwgr.c,v 1.11 2025-01-21 22:19:37+05:30 Cprogrammer Exp mbhangui $"; x++; } diff --git a/base/sconfig.c b/base/sconfig.c index 3c9ece7..12d78d3 100644 --- a/base/sconfig.c +++ b/base/sconfig.c @@ -1,5 +1,8 @@ /* * $Log: sconfig.c,v $ + * Revision 1.7 2025-01-21 22:19:42+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.6 2024-05-09 23:46:19+05:30 mbhangui * fix discarded-qualifier compiler warnings * @@ -99,7 +102,7 @@ config_readline(config_str *c, const char *fn) return 0; return -1; } - substdio_fdbuf(&ss, read, fd, inbuf, sizeof inbuf); + substdio_fdbuf(&ss, (ssize_t (*)(int, char *, size_t)) read, fd, inbuf, sizeof inbuf); if (getln(&ss, &line, &match, '\n') == -1) { close(fd); return -1; @@ -127,7 +130,7 @@ config_readfile(config_str *c, const char *fn) return 0; return -1; } - substdio_fdbuf(&ss, read, fd, inbuf, sizeof inbuf); + substdio_fdbuf(&ss, (ssize_t (*)(int, char *, size_t)) read, fd, inbuf, sizeof inbuf); for (;;) { if (getln(&ss, &line, &match, '\n') == -1) { close(fd); @@ -153,7 +156,7 @@ config_readfile(config_str *c, const char *fn) void getversion_sconfig_c() { - const char *x = "$Id: sconfig.c,v 1.6 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: sconfig.c,v 1.7 2025-01-21 22:19:42+05:30 Cprogrammer Exp mbhangui $"; x++; } diff --git a/base/setuserid.c b/base/setuserid.c index d647fd0..d634661 100644 --- a/base/setuserid.c +++ b/base/setuserid.c @@ -1,5 +1,5 @@ /* - * $Id: setuserid.c,v 1.9 2024-05-12 20:50:36+05:30 Cprogrammer Exp mbhangui $ + * $Id: setuserid.c,v 1.10 2025-01-21 22:19:45+05:30 Cprogrammer Exp mbhangui $ */ #include #ifdef HAVE_CONFIG_H @@ -69,7 +69,7 @@ grpscan(const char *user, int *ngroups) } } *ngroups = idx; - if (!alloc_re((char *) &gidset, maxgroups * sizeof(gid_t), idx * sizeof(gid_t))) { + if (!alloc_re((void **) &gidset, maxgroups * sizeof(gid_t), idx * sizeof(gid_t))) { alloc_free((char *) gidset); return ((gid_t *) 0); } @@ -175,7 +175,7 @@ setuserid(const char *user, int set_supp_id, const char *groups) ngroups++; } ngroups++; - if (!alloc_re((char *) &gidset, old * sizeof(gid_t), ngroups * sizeof(gid_t))) + if (!alloc_re((void **) &gidset, old * sizeof(gid_t), ngroups * sizeof(gid_t))) return -1; if (!(groups_t = (char *) alloc((t = str_len(groups)) + 1))) { t = errno; @@ -261,13 +261,16 @@ setuser_privileges(uid_t uid, gid_t gid, const char *user) void getversion_setuserid_c() { - const char *x = "$Id: setuserid.c,v 1.9 2024-05-12 20:50:36+05:30 Cprogrammer Exp mbhangui $"; + const char *x = "$Id: setuserid.c,v 1.10 2025-01-21 22:19:45+05:30 Cprogrammer Exp mbhangui $"; x++; } /* * $Log: setuserid.c,v $ + * Revision 1.10 2025-01-21 22:19:45+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.9 2024-05-12 20:50:36+05:30 Cprogrammer * fix function prototypes * diff --git a/base/sig.c b/base/sig.c index 06cd580..b53c393 100644 --- a/base/sig.c +++ b/base/sig.c @@ -1,5 +1,8 @@ /* * $Log: sig.c,v $ + * Revision 1.5 2025-01-21 22:20:00+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.4 2024-05-09 23:46:19+05:30 mbhangui * fix discarded-qualifier compiler warnings * @@ -29,13 +32,13 @@ int sig_term = SIGTERM; int sig_usr1 = SIGUSR1; int sig_usr2 = SIGUSR2; -void (*sig_defaulthandler) () = SIG_DFL; -void (*sig_ignorehandler) () = SIG_IGN; +void (*sig_defaulthandler) (int) = SIG_DFL; +void (*sig_ignorehandler) (int) = SIG_IGN; void getversion_sig_c() { - const char *x = "$Id: sig.c,v 1.4 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: sig.c,v 1.5 2025-01-21 22:20:00+05:30 Cprogrammer Exp mbhangui $"; x++; } diff --git a/base/sig.h b/base/sig.h index e4edcc3..5336a45 100644 --- a/base/sig.h +++ b/base/sig.h @@ -1,5 +1,8 @@ /* * $Log: sig.h,v $ + * Revision 1.9 2025-01-21 22:20:07+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.8 2020-08-03 18:10:35+05:30 Cprogrammer * added sig_usr1, sig_usr2 * @@ -25,7 +28,7 @@ #ifndef SIG_H #define SIG_H -void sig_catch(int, void(*)()); +void sig_catch(int, void(*)(int)); void sig_block(int); void sig_unblock(int); void sig_blocknone(void); @@ -34,7 +37,7 @@ void sig_pause(void); void sig_dfl(); void sig_miscignore(void); -void sig_bugcatch(void (*)()); +void sig_bugcatch(void (*)(int)); void sig_pipeignore(void); void sig_pipedefault(void); @@ -46,27 +49,27 @@ void sig_contdefault(); void sig_termblock(void); void sig_termunblock(void); -void sig_termcatch(void (*)()); +void sig_termcatch(void (*)(int)); void sig_termdefault(void); void sig_alarmblock(void); void sig_alarmunblock(void); -void sig_alarmcatch(void (*)()); +void sig_alarmcatch(void (*)(int)); void sig_alarmdefault(void); void sig_intblock(void); void sig_intunblock(void); -void sig_intcatch(void (*)()); +void sig_intcatch(void (*)(int)); void sig_intdefault(void); void sig_childblock(void); void sig_childunblock(void); -void sig_childcatch(void (*)()); +void sig_childcatch(void (*)(int)); void sig_childdefault(void); void sig_hangupblock(void); void sig_hangupunblock(void); -void sig_hangupcatch(void (*)()); +void sig_hangupcatch(void (*)(int)); void sig_hangupdefault(void); extern int sig_alarm; @@ -79,8 +82,8 @@ extern int sig_term; extern int sig_usr1; extern int sig_usr2; -extern void (*sig_defaulthandler) (); -extern void (*sig_ignorehandler) (); +extern void (*sig_defaulthandler) (int); +extern void (*sig_ignorehandler) (int); #define sig_ignore(s) (sig_catch((s),sig_ignorehandler)) #define sig_uncatch(s) (sig_catch((s),sig_defaulthandler)) diff --git a/base/sig_alarm.c b/base/sig_alarm.c index b1f6ec0..cfa1a00 100644 --- a/base/sig_alarm.c +++ b/base/sig_alarm.c @@ -1,5 +1,8 @@ /* * $Log: sig_alarm.c,v $ + * Revision 1.6 2025-01-21 22:19:48+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.5 2024-05-09 23:46:19+05:30 mbhangui * fix discarded-qualifier compiler warnings * @@ -29,7 +32,7 @@ sig_alarmunblock() } void -sig_alarmcatch(void (*f) ()) +sig_alarmcatch(void (*f) (int)) { sig_catch(SIGALRM, f); } @@ -43,7 +46,7 @@ sig_alarmdefault() void getversion_sig_alarm_c() { - const char *x = "$Id: sig_alarm.c,v 1.5 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: sig_alarm.c,v 1.6 2025-01-21 22:19:48+05:30 Cprogrammer Exp mbhangui $"; x++; } diff --git a/base/sig_bug.c b/base/sig_bug.c index 74a4dd4..2c22d77 100644 --- a/base/sig_bug.c +++ b/base/sig_bug.c @@ -1,5 +1,8 @@ /* * $Log: sig_bug.c,v $ + * Revision 1.6 2025-01-21 22:19:51+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.5 2024-05-09 23:46:19+05:30 mbhangui * fix discarded-qualifier compiler warnings * @@ -17,7 +20,7 @@ #include "sig.h" void -sig_bugcatch(void (*f) ()) +sig_bugcatch(void (*f) (int)) { sig_catch(SIGILL, f); sig_catch(SIGABRT, f); @@ -35,7 +38,7 @@ sig_bugcatch(void (*f) ()) void getversion_sig_bug_c() { - const char *x = "$Id: sig_bug.c,v 1.5 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: sig_bug.c,v 1.6 2025-01-21 22:19:51+05:30 Cprogrammer Exp mbhangui $"; x++; } diff --git a/base/sig_catch.c b/base/sig_catch.c index c60205c..ca8a3fd 100644 --- a/base/sig_catch.c +++ b/base/sig_catch.c @@ -1,5 +1,8 @@ /* * $Log: sig_catch.c,v $ + * Revision 1.6 2025-01-21 22:19:54+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.5 2024-05-09 23:46:19+05:30 mbhangui * fix discarded-qualifier compiler warnings * @@ -18,7 +21,7 @@ #include "hassgact.h" void -sig_catch(int sig, void (*f) ()) +sig_catch(int sig, void (*f) (int)) { #ifdef HASSIGACTION struct sigaction sa; @@ -34,7 +37,7 @@ sig_catch(int sig, void (*f) ()) void getversion_sig_catch_c() { - const char *x = "$Id: sig_catch.c,v 1.5 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: sig_catch.c,v 1.6 2025-01-21 22:19:54+05:30 Cprogrammer Exp mbhangui $"; x++; } diff --git a/base/sig_child.c b/base/sig_child.c index ce79aad..164c260 100644 --- a/base/sig_child.c +++ b/base/sig_child.c @@ -1,5 +1,8 @@ /* * $Log: sig_child.c,v $ + * Revision 1.6 2025-01-21 22:19:57+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.5 2024-05-09 23:46:19+05:30 mbhangui * fix discarded-qualifier compiler warnings * @@ -29,7 +32,7 @@ sig_childunblock() } void -sig_childcatch(void (*f) ()) +sig_childcatch(void (*f) (int)) { sig_catch(SIGCHLD, f); } @@ -43,7 +46,7 @@ sig_childdefault() void getversion_sig_child_c() { - const char *x = "$Id: sig_child.c,v 1.5 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: sig_child.c,v 1.6 2025-01-21 22:19:57+05:30 Cprogrammer Exp mbhangui $"; x++; } diff --git a/base/sig_hup.c b/base/sig_hup.c index 1318edf..9baefaf 100644 --- a/base/sig_hup.c +++ b/base/sig_hup.c @@ -1,5 +1,8 @@ /* * $Log: sig_hup.c,v $ + * Revision 1.6 2025-01-21 22:20:03+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.5 2024-05-09 23:46:19+05:30 mbhangui * fix discarded-qualifier compiler warnings * @@ -29,7 +32,7 @@ sig_hangupunblock() } void -sig_hangupcatch(void (*f) ()) +sig_hangupcatch(void (*f) (int)) { sig_catch(SIGHUP, f); } @@ -43,7 +46,7 @@ sig_hangupdefault() void getversion_sig_hup_c() { - const char *x = "$Id: sig_hup.c,v 1.5 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: sig_hup.c,v 1.6 2025-01-21 22:20:03+05:30 Cprogrammer Exp mbhangui $"; x++; } diff --git a/base/sig_int.c b/base/sig_int.c index a748415..21ad919 100644 --- a/base/sig_int.c +++ b/base/sig_int.c @@ -1,5 +1,8 @@ /* * $Log: sig_int.c,v $ + * Revision 1.4 2025-01-21 22:20:11+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.3 2024-05-09 23:46:19+05:30 mbhangui * fix discarded-qualifier compiler warnings * @@ -27,7 +30,7 @@ sig_intunblock() } void -sig_intcatch(void (*f) ()) +sig_intcatch(void (*f) (int)) { sig_catch(SIGINT, f); } @@ -41,7 +44,7 @@ sig_intdefault() void getversion_sig_int_c() { - const char *x = "$Id: sig_int.c,v 1.3 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: sig_int.c,v 1.4 2025-01-21 22:20:11+05:30 Cprogrammer Exp mbhangui $"; x++; } diff --git a/base/sig_term.c b/base/sig_term.c index bb36d78..49c03b9 100644 --- a/base/sig_term.c +++ b/base/sig_term.c @@ -1,5 +1,8 @@ /* * $Log: sig_term.c,v $ + * Revision 1.6 2025-01-21 22:20:16+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.5 2024-05-09 23:46:19+05:30 mbhangui * fix discarded-qualifier compiler warnings * @@ -29,7 +32,7 @@ sig_termunblock() } void -sig_termcatch(void (*f) ()) +sig_termcatch(void (*f) (int)) { sig_catch(SIGTERM, f); } @@ -43,7 +46,7 @@ sig_termdefault() void getversion_sig_term_c() { - const char *x = "$Id: sig_term.c,v 1.5 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: sig_term.c,v 1.6 2025-01-21 22:20:16+05:30 Cprogrammer Exp mbhangui $"; x++; } diff --git a/base/stralloc_eady.c b/base/stralloc_eady.c index e4c9984..40054bb 100644 --- a/base/stralloc_eady.c +++ b/base/stralloc_eady.c @@ -1,5 +1,8 @@ /* * $Log: stralloc_eady.c,v $ + * Revision 1.9 2025-01-21 22:20:19+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.8 2024-05-09 23:46:19+05:30 mbhangui * fix discarded-qualifier compiler warnings * @@ -22,9 +25,7 @@ * added RCS log * */ -#define _ALLOC_ #include "alloc.h" -#undef _ALLOC_ #include "stralloc.h" #include "gen_allocdefs.h" @@ -39,7 +40,7 @@ GEN_ALLOC_ready(stralloc, char, s, len, a, 30, stralloc_ready) void getversion_stralloc_eady_c() { - const char *x = "$Id: stralloc_eady.c,v 1.8 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: stralloc_eady.c,v 1.9 2025-01-21 22:20:19+05:30 Cprogrammer Exp mbhangui $"; x++; } diff --git a/base/subfd.h b/base/subfd.h index 61ffabb..82629ae 100644 --- a/base/subfd.h +++ b/base/subfd.h @@ -1,5 +1,8 @@ /* * $Log: subfd.h,v $ + * Revision 1.5 2025-01-21 22:20:26+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.4 2008-07-14 20:58:52+05:30 Cprogrammer * fixed compilation warning on 64 bit os * @@ -21,7 +24,7 @@ extern substdio *subfdout; extern substdio *subfdoutsmall; extern substdio *subfderr; -ssize_t subfd_read(int, char *, int); -ssize_t subfd_readsmall(int, char *, int); +ssize_t subfd_read(int, char *, size_t); +ssize_t subfd_readsmall(int, char *, size_t); #endif diff --git a/base/subfderr.c b/base/subfderr.c index c45e3f3..3cc5300 100644 --- a/base/subfderr.c +++ b/base/subfderr.c @@ -1,24 +1,27 @@ /* - * $Id: subfderr.c,v 1.6 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $ + * $Id: subfderr.c,v 1.7 2025-01-21 22:20:23+05:30 Cprogrammer Exp mbhangui $ */ #include #include "substdio.h" #include "subfd.h" char subfd_errbuf[SUBSTDIO_SMALL]; -static substdio it = SUBSTDIO_FDBUF(write, 2, subfd_errbuf, SUBSTDIO_SMALL); +static substdio it = SUBSTDIO_FDBUF((ssize_t (*)(int, char *, size_t)) write, 2, subfd_errbuf, SUBSTDIO_SMALL); substdio *subfderr = ⁢ void getversion_subfderr_c() { - const char *x = "$Id: subfderr.c,v 1.6 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: subfderr.c,v 1.7 2025-01-21 22:20:23+05:30 Cprogrammer Exp mbhangui $"; x++; } /* * $Log: subfderr.c,v $ + * Revision 1.7 2025-01-21 22:20:23+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.6 2024-05-09 23:46:19+05:30 mbhangui * fix discarded-qualifier compiler warnings * diff --git a/base/subfdin.c b/base/subfdin.c index d8649f6..e61fbbb 100644 --- a/base/subfdin.c +++ b/base/subfdin.c @@ -1,5 +1,8 @@ /* * $Log: subfdin.c,v $ + * Revision 1.8 2025-01-21 22:20:29+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.7 2024-05-09 23:46:19+05:30 mbhangui * fix discarded-qualifier compiler warnings * @@ -24,7 +27,7 @@ #include "subfd.h" ssize_t -subfd_read(int fd, char *buf, int len) +subfd_read(int fd, char *buf, size_t len) { if (substdio_flush(subfdout) == -1) return -1; @@ -38,7 +41,7 @@ substdio *subfdin = ⁢ void getversion_subfdin_c() { - const char *x = "$Id: subfdin.c,v 1.7 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: subfdin.c,v 1.8 2025-01-21 22:20:29+05:30 Cprogrammer Exp mbhangui $"; x++; } diff --git a/base/subfdins.c b/base/subfdins.c index 834dab7..ab7d94e 100644 --- a/base/subfdins.c +++ b/base/subfdins.c @@ -1,12 +1,12 @@ /* - * $Id: subfdins.c,v 1.8 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $ + * $Id: subfdins.c,v 1.9 2025-01-21 22:20:35+05:30 Cprogrammer Exp mbhangui $ */ #include #include "substdio.h" #include "subfd.h" ssize_t -subfd_readsmall(int fd, char *buf, int len) +subfd_readsmall(int fd, char *buf, size_t len) { if (substdio_flush(subfdoutsmall) == -1) return -1; @@ -20,13 +20,16 @@ substdio *subfdinsmall = ⁢ void getversion_subfdins_c() { - const char *x = "$Id: subfdins.c,v 1.8 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: subfdins.c,v 1.9 2025-01-21 22:20:35+05:30 Cprogrammer Exp mbhangui $"; x++; } /* * $Log: subfdins.c,v $ + * Revision 1.9 2025-01-21 22:20:35+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.8 2024-05-09 23:46:19+05:30 mbhangui * fix discarded-qualifier compiler warnings * diff --git a/base/subfdout.c b/base/subfdout.c index b30a66e..61a6f16 100644 --- a/base/subfdout.c +++ b/base/subfdout.c @@ -1,5 +1,8 @@ /* * $Log: subfdout.c,v $ + * Revision 1.6 2025-01-21 22:20:39+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.5 2024-05-09 23:46:19+05:30 mbhangui * fix discarded-qualifier compiler warnings * @@ -18,13 +21,13 @@ #include "subfd.h" char subfd_outbuf[SUBSTDIO_OUTSIZE]; -static substdio it = SUBSTDIO_FDBUF(write, 1, subfd_outbuf, SUBSTDIO_OUTSIZE); +static substdio it = SUBSTDIO_FDBUF((ssize_t (*)(int, char *, size_t)) write, 1, subfd_outbuf, SUBSTDIO_OUTSIZE); substdio *subfdout = ⁢ void getversion_subfdout_c() { - const char *x = "$Id: subfdout.c,v 1.5 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: subfdout.c,v 1.6 2025-01-21 22:20:39+05:30 Cprogrammer Exp mbhangui $"; x++; } diff --git a/base/subfdouts.c b/base/subfdouts.c index 4cb432b..4a6ae24 100644 --- a/base/subfdouts.c +++ b/base/subfdouts.c @@ -1,5 +1,5 @@ /* - * $Id: subfdouts.c,v 1.6 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $ + * $Id: subfdouts.c,v 1.7 2025-01-21 22:21:33+05:30 Cprogrammer Exp mbhangui $ */ #include @@ -7,19 +7,22 @@ #include "subfd.h" char subfd_outbufsmall[SUBSTDIO_SMALL]; -static substdio it = SUBSTDIO_FDBUF(write, 1, subfd_outbufsmall, SUBSTDIO_SMALL); +static substdio it = SUBSTDIO_FDBUF((ssize_t (*)(int, char *, size_t)) write, 1, subfd_outbufsmall, SUBSTDIO_SMALL); substdio *subfdoutsmall = ⁢ void getversion_subfdouts_c() { - const char *x = "$Id: subfdouts.c,v 1.6 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: subfdouts.c,v 1.7 2025-01-21 22:21:33+05:30 Cprogrammer Exp mbhangui $"; x++; } /* * $Log: subfdouts.c,v $ + * Revision 1.7 2025-01-21 22:21:33+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.6 2024-05-09 23:46:19+05:30 mbhangui * fix discarded-qualifier compiler warnings * diff --git a/base/substdio.c b/base/substdio.c index 3fda30c..01d9bca 100644 --- a/base/substdio.c +++ b/base/substdio.c @@ -1,5 +1,8 @@ /* * $Log: substdio.c,v $ + * Revision 1.7 2025-01-21 22:21:37+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.6 2024-05-09 23:46:19+05:30 mbhangui * fix discarded-qualifier compiler warnings * @@ -20,7 +23,7 @@ #include void -substdio_fdbuf(register substdio *s, register ssize_t (*op)(), +substdio_fdbuf(register substdio *s, register ssize_t (*op)(int, char *, size_t), register int fd, register char *buf, register size_t len) { s->x = buf; @@ -33,7 +36,7 @@ substdio_fdbuf(register substdio *s, register ssize_t (*op)(), void getversion_substdio_c() { - const char *x = "$Id: substdio.c,v 1.6 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: substdio.c,v 1.7 2025-01-21 22:21:37+05:30 Cprogrammer Exp mbhangui $"; x++; } diff --git a/base/substdio.h b/base/substdio.h index a4bc7e5..18b5ace 100644 --- a/base/substdio.h +++ b/base/substdio.h @@ -1,23 +1,22 @@ /* - * $Id: substdio.h,v 1.11 2024-01-22 10:19:03+05:30 Cprogrammer Exp mbhangui $ + * $Id: substdio.h,v 1.12 2025-01-21 22:21:42+05:30 Cprogrammer Exp mbhangui $ */ #ifndef SUBSTDIO_H #define SUBSTDIO_H #include -typedef struct substdio -{ +typedef struct substdio { char *x; - int p; - int n; + unsigned int p; + size_t n; int fd; - ssize_t (*op) (); + ssize_t (*op) (int, char *, size_t); } substdio; #define SUBSTDIO_FDBUF(op,fd,buf,len) { (buf), 0, (len), (fd), (op) } -void substdio_fdbuf(substdio *, ssize_t (*op) (), int, char *, size_t); +void substdio_fdbuf(substdio *, ssize_t (*op) (int, char *, size_t), int, char *, size_t); int substdio_flush(substdio *); void substdio_discard(substdio *); int substdio_putalign(substdio *, const char *, size_t); @@ -50,6 +49,9 @@ int substdio_copy(substdio *, substdio *); /* * $Log: substdio.h,v $ + * Revision 1.12 2025-01-21 22:21:42+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.11 2024-01-22 10:19:03+05:30 Cprogrammer * added definition SUBSTDIO_SMALL * diff --git a/base/substdo.c b/base/substdo.c index 056db9d..cc8c614 100644 --- a/base/substdo.c +++ b/base/substdo.c @@ -1,5 +1,8 @@ /* * $Log: substdo.c,v $ + * Revision 1.14 2025-01-21 22:21:45+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.13 2024-05-12 00:10:20+05:30 mbhangui * fix function prototypes * @@ -78,7 +81,7 @@ substdio_flush(register substdio *s) if (!(p = s->p)) return 0; s->p = 0; - return allwrite(s->op, s->fd, s->x, p); + return allwrite((ssize_t (*)(int, const char *, size_t)) s->op, s->fd, s->x, p); } int @@ -140,7 +143,7 @@ substdio_put(register substdio *s, register const char *buf, register size_t len while (len > (unsigned int) s->n) { if (n > len) n = len; - if (allwrite(s->op, s->fd, buf, n) == -1) + if (allwrite((ssize_t (*)(int, const char *, size_t)) s->op, s->fd, buf, n) == -1) return -1; buf += n; len -= n; @@ -157,7 +160,7 @@ substdio_putflush(register substdio *s, register const char *buf, register size_ { if (substdio_flush(s) == -1) return -1; - return allwrite(s->op, s->fd, buf, len); + return allwrite((ssize_t (*)(int, const char *, size_t)) s->op, s->fd, buf, len); } int @@ -181,7 +184,7 @@ substdio_putsflush(register substdio *s, register const char *buf) void getversion_substdo_c() { - const char *x = "$Id: substdo.c,v 1.13 2024-05-12 00:10:20+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: substdo.c,v 1.14 2025-01-21 22:21:45+05:30 Cprogrammer Exp mbhangui $"; x++; } diff --git a/base/timeoutwrite.c b/base/timeoutwrite.c index 5b747a5..1f2a5f6 100644 --- a/base/timeoutwrite.c +++ b/base/timeoutwrite.c @@ -1,5 +1,8 @@ /* * $Log: timeoutwrite.c,v $ + * Revision 1.9 2025-01-21 22:21:49+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.8 2024-05-09 23:46:19+05:30 mbhangui * fix discarded-qualifier compiler warnings * @@ -31,7 +34,7 @@ #ifdef IOPAUSE_POLL /*- taken from Erwin Hofman fehQlibs */ ssize_t -timeoutwrite(long t, int fd, char *buf, size_t len) +timeoutwrite(long t, int fd, const char *buf, size_t len) { struct taia now; struct taia deadline; @@ -83,7 +86,7 @@ timeoutwrite(long t, int fd, char *buf, size_t len) void getversion_timeoutwrite_c() { - const char *x = "$Id: timeoutwrite.c,v 1.8 2024-05-09 23:46:19+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: timeoutwrite.c,v 1.9 2025-01-21 22:21:49+05:30 Cprogrammer Exp mbhangui $"; x++; } diff --git a/base/timeoutwrite.h b/base/timeoutwrite.h index e457b21..0d9a6ec 100644 --- a/base/timeoutwrite.h +++ b/base/timeoutwrite.h @@ -1,5 +1,8 @@ /* * $Log: timeoutwrite.h,v $ + * Revision 1.5 2025-01-21 22:21:52+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.4 2021-03-03 23:56:44+05:30 Cprogrammer * fix data types * @@ -14,6 +17,6 @@ #define TIMEOUTWRITE_H #include -ssize_t timeoutwrite(long, int, char *, size_t); +ssize_t timeoutwrite(long, int, const char *, size_t); #endif diff --git a/base/token822.c b/base/token822.c index f9d9a7e..c90cefb 100644 --- a/base/token822.c +++ b/base/token822.c @@ -1,29 +1,5 @@ /* - * $Log: token822.c,v $ - * Revision 1.9 2024-05-12 00:10:20+05:30 mbhangui - * fix function prototypes - * - * Revision 1.8 2024-05-09 23:46:19+05:30 mbhangui - * fix discarded-qualifier compiler warnings - * - * Revision 1.7 2022-10-18 20:00:50+05:30 Cprogrammer - * converted proto to ansic - * - * Revision 1.6 2020-11-22 23:12:20+05:30 Cprogrammer - * removed supression of ANSI C proto - * - * Revision 1.5 2020-05-10 17:47:25+05:30 Cprogrammer - * GEN_ALLOC refactoring (by Rolf Eike Beer) to fix memory overflow reported by Qualys Security Advisory - * - * Revision 1.4 2004-10-22 20:31:48+05:30 Cprogrammer - * added RCS id - * - * Revision 1.3 2004-10-11 14:15:54+05:30 Cprogrammer - * prevent inclusion of alloc.h with prototypes - * - * Revision 1.2 2004-07-17 21:24:56+05:30 Cprogrammer - * added RCS log - * + * $Id: token822.c,v 1.10 2025-01-21 22:21:57+05:30 Cprogrammer Exp mbhangui $ */ #include "stralloc.h" #include "alloc.h" @@ -41,8 +17,7 @@ token822_reverse(token822_alloc *ta) struct token822 temp; n = ta->len - 1; - for (i = 0; i + i < n; ++i) - { + for (i = 0; i + i < n; ++i) { temp = ta->t[i]; ta->t[i] = ta->t[n - i]; ta->t[n - i] = temp; @@ -608,7 +583,7 @@ gotaddr(token822_alloc *taout, token822_alloc *taaddr, int (*callback) (token822 } int -token822_addrlist(token822_alloc *taout, token822_alloc *taaddr, token822_alloc *ta, int (*callback) ()) +token822_addrlist(token822_alloc *taout, token822_alloc *taaddr, token822_alloc *ta, int (*callback) (token822_alloc *)) { struct token822 *t; struct token822 *beginning; @@ -712,7 +687,38 @@ if (!token822_append(taout,&comma)) return -1; } void getversion_token822_c() { - const char *x = "$Id: token822.c,v 1.9 2024-05-12 00:10:20+05:30 mbhangui Exp mbhangui $"; + const char *x = "$Id: token822.c,v 1.10 2025-01-21 22:21:57+05:30 Cprogrammer Exp mbhangui $"; x++; } + +/* + * $Log: token822.c,v $ + * Revision 1.10 2025-01-21 22:21:57+05:30 Cprogrammer + * fixes for gcc14 + * + * Revision 1.9 2024-05-12 00:10:20+05:30 mbhangui + * fix function prototypes + * + * Revision 1.8 2024-05-09 23:46:19+05:30 mbhangui + * fix discarded-qualifier compiler warnings + * + * Revision 1.7 2022-10-18 20:00:50+05:30 Cprogrammer + * converted proto to ansic + * + * Revision 1.6 2020-11-22 23:12:20+05:30 Cprogrammer + * removed supression of ANSI C proto + * + * Revision 1.5 2020-05-10 17:47:25+05:30 Cprogrammer + * GEN_ALLOC refactoring (by Rolf Eike Beer) to fix memory overflow reported by Qualys Security Advisory + * + * Revision 1.4 2004-10-22 20:31:48+05:30 Cprogrammer + * added RCS id + * + * Revision 1.3 2004-10-11 14:15:54+05:30 Cprogrammer + * prevent inclusion of alloc.h with prototypes + * + * Revision 1.2 2004-07-17 21:24:56+05:30 Cprogrammer + * added RCS log + * + */ diff --git a/base/token822.h b/base/token822.h index 717a3a0..a0dbee1 100644 --- a/base/token822.h +++ b/base/token822.h @@ -1,5 +1,8 @@ /* * $Log: token822.h,v $ + * Revision 1.5 2025-01-21 22:22:01+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.4 2009-06-04 12:09:14+05:30 Cprogrammer * added function prototypes * @@ -34,7 +37,7 @@ struct token822 }; int token822_parse(token822_alloc *, stralloc *, stralloc *); -int token822_addrlist(token822_alloc *, token822_alloc *, token822_alloc *, int (*callback)()); +int token822_addrlist(token822_alloc *, token822_alloc *, token822_alloc *, int (*callback)(token822_alloc *)); int token822_unquote(stralloc *, token822_alloc *); int token822_unparse(stralloc *, token822_alloc *, unsigned int); void token822_reverse(token822_alloc *); diff --git a/doc/ChangeLog b/doc/ChangeLog index 4509864..c2ae92f 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -9,6 +9,8 @@ Release 1.5-1.1 Start 05/09/2024 End 24/12/2024 variable - 21/12/2024 05. commands.c, commands.h: added cmd_name() function +- 21/01/2025 +06. Fix errors when using GCC14 * Tue Aug 06 2024 12:33:26 +0000 Manvendra Bhangui 1.4-1.1%{?dist} Release 1.4-1.1 Start 29/04/2024 End 06/08/2024 diff --git a/tls/tls.c b/tls/tls.c index 3058631..6cff292 100644 --- a/tls/tls.c +++ b/tls/tls.c @@ -1,5 +1,5 @@ /* - * $Id: tls.c,v 1.12 2024-05-12 00:10:54+05:30 mbhangui Exp mbhangui $ + * $Id: tls.c,v 1.13 2025-01-21 22:23:58+05:30 Cprogrammer Exp mbhangui $ * * ssl_timeoutio functions from Frederik Vermeulen's * tls patch for qmail @@ -34,7 +34,7 @@ #include "tls.h" #ifndef lint -static char sccsid[] = "$Id: tls.c,v 1.12 2024-05-12 00:10:54+05:30 mbhangui Exp mbhangui $"; +static char sccsid[] = "$Id: tls.c,v 1.13 2025-01-21 22:23:58+05:30 Cprogrammer Exp mbhangui $"; #endif #ifdef HAVE_SSL @@ -1026,7 +1026,7 @@ ssl_timeoutio(int (*fun1) (SSL *, char *, size_t), int (*fun2)(SSL *), default: /*- SSL_accept(), SSL_connect() will return here */ return r; /*- some other error. See man SSL_read(3ossl), SSL_write(3ossl), etc */ case SSL_ERROR_WANT_READ: - if (errno == EAGAIN && usessl == client && fun1 == (int (*)()) SSL_read && efd != -1) + if (errno == EAGAIN && usessl == client && fun1 == (int (*)(SSL *, char *, size_t)) SSL_read && efd != -1) FD_SET(efd, &fds); FD_SET(rfd, &fds); n = select(efd != -1 && efd > rfd ? efd + 1 : rfd + 1, &fds, NULL, NULL, &tv); @@ -1039,7 +1039,7 @@ ssl_timeoutio(int (*fun1) (SSL *, char *, size_t), int (*fun2)(SSL *), * efd becomes available to be read for data that can * be written to SSL. */ - if (usessl == client && fun1 == (int (*)()) SSL_read && efd != -1) { + if (usessl == client && fun1 == (int (*)(SSL *, char *, size_t)) SSL_read && efd != -1) { if (FD_ISSET(efd, &fds)) { errno = EAGAIN; return -1; @@ -1106,7 +1106,7 @@ ssl_timeoutaccept(long t, int rfd, int wfd, SSL *ssl) } ssize_t -allwritessl(SSL *myssl, char *buf, size_t len) +allwritessl(SSL *myssl, const char *buf, size_t len) { int w; size_t total = 0; @@ -1157,15 +1157,15 @@ ssl_timeoutread(long t, int rfd, int wfd, SSL *myssl, char *buf, size_t len) return 0; if ((n = SSL_pending(myssl))) return (SSL_read(myssl, buf, n <= len ? n : len)); - return ssl_timeoutio((int (*)())SSL_read, NULL, t, rfd, wfd, myssl, buf, len); + return ssl_timeoutio((int (*)(SSL *, char *, size_t))SSL_read, NULL, t, rfd, wfd, myssl, buf, len); } ssize_t -ssl_timeoutwrite(long t, int rfd, int wfd, SSL *myssl, char *buf, size_t len) +ssl_timeoutwrite(long t, int rfd, int wfd, SSL *myssl, const char *buf, size_t len) { if (!buf) return 0; - return ssl_timeoutio((int (*)())allwritessl, NULL, t, rfd, wfd, myssl, buf, len); + return ssl_timeoutio((int (*)(SSL *, char *, size_t))allwritessl, NULL, t, rfd, wfd, myssl, (char *) buf, len); } #endif @@ -1315,7 +1315,7 @@ tlsread(int fd, char *buf, size_t len, long timeout) } ssize_t -tlswrite(int fd, char *buf, size_t len, long timeout) +tlswrite(int fd, const char *buf, size_t len, long timeout) { ssize_t r; @@ -1355,6 +1355,9 @@ getversion_tls_c() /* * $Log: tls.c,v $ + * Revision 1.13 2025-01-21 22:23:58+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.12 2024-05-12 00:10:54+05:30 mbhangui * fix function prototypes * diff --git a/tls/tls.h b/tls/tls.h index 0a757b8..a6d0f4a 100644 --- a/tls/tls.h +++ b/tls/tls.h @@ -1,5 +1,5 @@ /* - * $Id: tls.h,v 1.7 2024-09-05 18:08:20+05:30 Cprogrammer Exp mbhangui $ + * $Id: tls.h,v 1.8 2025-01-21 22:24:02+05:30 Cprogrammer Exp mbhangui $ */ #ifndef _TLS_H #define _TLS_H @@ -14,7 +14,7 @@ enum starttls {smtp, pop3, imap, unknown}; extern struct strerr strerr_tls; ssize_t tlsread(int, char *, size_t, long); -ssize_t tlswrite(int, char *, size_t, long); +ssize_t tlswrite(int, const char *, size_t, long); #if defined(HAVE_SSL) || defined(TLS) SSL_CTX *tls_init(const char *, const char *, const char *, const char *, const char *, enum tlsmode); int get_tls_method(const char *); @@ -27,12 +27,12 @@ int tls_connect(int, int, int, SSL *, const char *); int tls_accept(int, int, int, SSL *); void ssl_free(); int translate(int, int, int, int, unsigned int); -ssize_t allwritessl(SSL *, char *, size_t); -ssize_t ssl_timeoutio(int (*fun1) (), int (*fun2)(), long, int, int, SSL *, char *, size_t); +ssize_t allwritessl(SSL *, const char *, size_t); +ssize_t ssl_timeoutio(int (*fun1) (SSL *, char *, size_t), int (*fun2)(SSL *), long, int, int, SSL *, char *, size_t); int ssl_timeoutconn(long, int, int, SSL *); int ssl_timeoutaccept(long, int, int, SSL *); ssize_t ssl_timeoutread(long, int, int, SSL *, char *, size_t); -ssize_t ssl_timeoutwrite(long, int, int, SSL *, char *, size_t); +ssize_t ssl_timeoutwrite(long, int, int, SSL *, const char *, size_t); int ssl_timeoutrehandshake(long, int, int, SSL *); const char *myssl_error_str(); const char *myssl_error(); @@ -52,6 +52,9 @@ EVP_PKEY *get_dhkey(int, int, const char *); /* * $Log: tls.h,v $ + * Revision 1.8 2025-01-21 22:24:02+05:30 Cprogrammer + * fixes for gcc14 + * * Revision 1.7 2024-09-05 18:08:20+05:30 Cprogrammer * added imap to starttls enumeration *