From 721a587c7965e284b8a281d2286a2a436b5b8424 Mon Sep 17 00:00:00 2001 From: Eduardo Chappa Date: Sun, 18 Oct 2020 18:25:57 -0600 Subject: * Fixes to warnings given by gcc 10. --- doc/tech-notes/tech-notes.txt | 102 ------------------------------------------ pico/buffer.c | 2 +- pico/composer.c | 2 +- pith/pine.hlp | 2 +- regex/Makefile | 76 +++++++++++++++---------------- 5 files changed, 41 insertions(+), 143 deletions(-) diff --git a/doc/tech-notes/tech-notes.txt b/doc/tech-notes/tech-notes.txt index 9f4ff4d1..f9702f52 100644 --- a/doc/tech-notes/tech-notes.txt +++ b/doc/tech-notes/tech-notes.txt @@ -1,106 +1,4 @@ - Alpine Technical Notes - - Version 2.24, October 2020 - -Table of Contents - - Introduction - - * Design Goals - * Alpine Components - - Background Details - - * Domain Names - * RFC 2822 Compliance - * SMTP and Sendmail - * Internet Message Access Protocol (IMAP) - * Multipurpose Internet Mail Extensions (MIME) - * Folder Collections - - Building and Installation - - * Compile-time Options - * Including LDAP Functionality - * Including Kerberos 5 Functionality - * Other Alpine Compile-time Options - * IMAPd Compile-time Options - * Building the Alpine Programs - * Installing Alpine and Pico on UNIX Platforms - * Installing PC-Alpine - * Installing IMAPd - * Support Files and Environment Variables: UNIX Alpine - * Support Files, Environment Variables, and Registry Values: - PC-Alpine - - Command Line Arguments - - * Alpine - * Pico - * Pilot - - Configuration and Preferences - - * Alpine Configuration - * General Configuration Variables - * Configuration Features - * Hidden Config Variables and Features - * Retired Variables - * Tokens for Index and Replying - * Conditional Inclusion of Text for Reply-Leadin, Signatures, and - Templates - * Per Server Directory Configuration - * Color Configuration - * Index Line Color Configuration - * Role Configuration - * Filtering Configuration - * Scoring Configuration - * Other Rules Configuration - * Search Rules Configuration - * Patterns - * Configuring News - Configuration Notes - + Alpine in Function Key Mode - + Domain Settings - + Syntax for Collections - + Syntax for Folder Names - + Server Name Syntax - + Folder Namespaces - + What is a Mail Drop? - + Sorting a Folder - + Alternate Editor - + Signatures and Signature Placement - + Feature List Variable - + Configuration Inheritance - + Using Environment Variables - + SMTP Servers - + MIME.Types file - + Color Details - + S/MIME Overview - + Additional Notes on PC-Alpine - - Behind the Scenes - - * Address Books - * Remote Configuration - * Checkpointing - * Debug Files - * INBOX and Special Folders - * Internal Help Files - * International Character Sets - * Interrupted and Postponed Messages - * Message Status - * MIME: Reading a Message - * MIME: Sending a Message - * New Mail Notification - * NFS - * Printers and Printing - * Save and Export - * Sent Mail - * Spell Checker - * Terminal Emulation and Key Mapping - Introduction Design Goals diff --git a/pico/buffer.c b/pico/buffer.c index 741c969f..a38bac21 100644 --- a/pico/buffer.c +++ b/pico/buffer.c @@ -334,7 +334,7 @@ sgetline(char **ibuf, int *nchars, char *obuf, int blen) retval = FIOEOF; } else{ - len = obuf + blen; + len = obuf + blen - 1; while (*cbuf != CR && *cbuf != LF && *cbuf != '\0'){ if(bufp < len){ *bufp++ = *cbuf++; diff --git a/pico/composer.c b/pico/composer.c index a20314b5..dcce3b79 100644 --- a/pico/composer.c +++ b/pico/composer.c @@ -3665,7 +3665,7 @@ call_builder(struct headerentry *entry, int *mangled, char **err) sbuflen += (6*term.t_ncol); line = line->next; } - + sbuflen++; if((sbuf=(char *)malloc(sbuflen * sizeof(*sbuf))) == NULL){ emlwrite("Can't malloc space to expand address", NULL); return(-1); diff --git a/pith/pine.hlp b/pith/pine.hlp index c213fdcf..56f77bcd 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any reasonable place to be called from. Dummy change to get revision in pine.hlp ============= h_revision ================= -Alpine Commit 511 2020-10-10 14:28:24 +Alpine Commit 512 2020-10-18 17:44:58 ============= h_news ================= diff --git a/regex/Makefile b/regex/Makefile index 3e660b14..903f95c5 100644 --- a/regex/Makefile +++ b/regex/Makefile @@ -43,8 +43,8 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-unknown-linux-gnu -host_triplet = x86_64-unknown-linux-gnu +build_triplet = x86_64-pc-linux-gnu +host_triplet = x86_64-pc-linux-gnu subdir = regex DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -92,27 +92,27 @@ DIST_SOURCES = $(libregex_a_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /run/media/echappa/Work/alpine/alpinegit/missing aclocal-1.15 +ACLOCAL = ${SHELL} /run/media/echappa/Alpine/alpine/alpinegit/missing aclocal-1.15 AMTAR = $${TAR-tar} AM_CFLAGS = -g AM_LDFLAGS = AR = /usr/bin/ar -AUTOCONF = ${SHELL} /run/media/echappa/Work/alpine/alpinegit/missing autoconf -AUTOHEADER = ${SHELL} /run/media/echappa/Work/alpine/alpinegit/missing autoheader -AUTOMAKE = ${SHELL} /run/media/echappa/Work/alpine/alpinegit/missing automake-1.15 +AUTOCONF = ${SHELL} /run/media/echappa/Alpine/alpine/alpinegit/missing autoconf +AUTOHEADER = ${SHELL} /run/media/echappa/Alpine/alpine/alpinegit/missing autoheader +AUTOMAKE = ${SHELL} /run/media/echappa/Alpine/alpine/alpinegit/missing automake-1.15 AWK = gawk -CC = gcc +CC = gcc-10 CCDEPMODE = depmode=gcc3 -CFLAGS = -g +CFLAGS = -g -O2 -DOPENSSL_1_1_0 -DOPENSSL_API_COMPAT=0x10100000L CP = /usr/bin/cp -CPP = gcc -E +CPP = gcc-10 -E CPPFLAGS = -I/usr/include -I/regex CYGPATH_W = echo -C_CLIENT_CFLAGS = EXTRACFLAGS=" -DTLSV1_2 -I/usr/include -I/regex -g" -C_CLIENT_GCCOPTLEVEL = GCCOPTLEVEL="-O0" -C_CLIENT_LDFLAGS = EXTRALDFLAGS=" -L/usr/lib -L/regex -lgssapi_krb5 -lpam -lldap -lssl -lcrypto -ldl -ltinfo -llber -lpam -lkrb5" +C_CLIENT_CFLAGS = EXTRACFLAGS=" -I/usr/include -I/regex -g -O2 -DOPENSSL_1_1_0 -DOPENSSL_API_COMPAT=0x10100000L" +C_CLIENT_GCCOPTLEVEL = +C_CLIENT_LDFLAGS = EXTRALDFLAGS=" -L/usr/lib -L/regex -lgssapi_krb5 -lcrypt -lssl -lcrypto -ldl -ltinfo -lkrb5" C_CLIENT_SPECIALS = SSLDIR=/usr SSLCERTS=/etc/ssl/certs -C_CLIENT_TARGET = lnp +C_CLIENT_TARGET = slx C_CLIENT_WITH_IPV6 = touch imap/ip6 DEFS = -DHAVE_CONFIG_H DEPDIR = .deps @@ -134,14 +134,14 @@ INSTALL_SCRIPT = ${INSTALL} INSTALL_STRIP_PROGRAM = $(install_sh) -c -s INTLLIBS = INTL_MACOSX_LIBS = -ISPELLPROG = +ISPELLPROG = hunspell Includedir = @Includedir@ LD = /usr/x86_64-suse-linux/bin/ld -m elf_x86_64 LDFLAGS = -L/usr/lib -L/regex LIBICONV = -liconv LIBINTL = LIBOBJS = -LIBS = -lgssapi_krb5 -lpam -lldap -lssl -lcrypto -ldl -ltinfo -llber -lpam -lkrb5 +LIBS = -lgssapi_krb5 -lcrypt -lssl -lcrypto -ldl -ltinfo -lkrb5 LIBTOOL = $(SHELL) $(top_builddir)/libtool LIBTOOL_DEPS = ./ltmain.sh LIPO = @@ -152,11 +152,11 @@ LTLIBINTL = LTLIBOBJS = MAINT = # MAKE = /usr/bin/make -MAKEINFO = ${SHELL} /run/media/echappa/Work/alpine/alpinegit/missing makeinfo +MAKEINFO = ${SHELL} /run/media/echappa/Alpine/alpine/alpinegit/missing makeinfo MKDIR_P = /usr/bin/mkdir -p MSGFMT = /usr/bin/msgfmt MSGFMT_015 = /usr/bin/msgfmt -MSGMERGE = /usr/bin/msgmerge +MSGMERGE = : NM = /usr/bin/nm -B NMEDIT = NPA_PROG = @@ -167,13 +167,13 @@ OTOOL64 = PACKAGE = alpine PACKAGE_BUGREPORT = chappa@washington.edu PACKAGE_NAME = alpine -PACKAGE_STRING = alpine 2.21 +PACKAGE_STRING = alpine 2.24 PACKAGE_TARNAME = alpine PACKAGE_URL = -PACKAGE_VERSION = 2.21 +PACKAGE_VERSION = 2.24 PATH_SEPARATOR = : POSUB = po -PTHREAD_CC = gcc +PTHREAD_CC = gcc-10 PTHREAD_CFLAGS = PTHREAD_LIBS = PWPROG = /usr/bin/passwd @@ -184,53 +184,53 @@ SED = /usr/bin/sed SENDMAIL = /usr/sbin/sendmail SET_MAKE = SHELL = /bin/sh -SPELLPROG = spell +SPELLPROG = hunspell STRIP = strip USE_NLS = yes -VERSION = 2.21 +VERSION = 2.24 WEB_BINDIR = WEB_BUILD = WEB_PUBCOOKIE_BUILD = WEB_PUBCOOKIE_LIB = WEB_PUBCOOKIE_LINK = -XGETTEXT = /usr/bin/xgettext -XGETTEXT_015 = /usr/bin/xgettext -abs_builddir = /run/media/echappa/Work/alpine/alpinegit/regex -abs_srcdir = /run/media/echappa/Work/alpine/alpinegit/regex -abs_top_builddir = /run/media/echappa/Work/alpine/alpinegit -abs_top_srcdir = /run/media/echappa/Work/alpine/alpinegit -ac_ct_CC = gcc +XGETTEXT = : +XGETTEXT_015 = : +abs_builddir = /run/media/echappa/Alpine/alpine/alpinegit/regex +abs_srcdir = /run/media/echappa/Alpine/alpine/alpinegit/regex +abs_top_builddir = /run/media/echappa/Alpine/alpine/alpinegit +abs_top_srcdir = /run/media/echappa/Alpine/alpine/alpinegit +ac_ct_CC = gcc-10 ac_ct_DUMPBIN = acx_pthread_config = no -alpine_interactive_spellcheck = -alpine_simple_spellcheck = +alpine_interactive_spellcheck = /usr/bin/hunspell +alpine_simple_spellcheck = /usr/bin/hunspell -l am__include = include am__leading_dot = . am__quote = am__tar = $${TAR-tar} chof - "$$tardir" am__untar = $${TAR-tar} xf - bindir = ${exec_prefix}/bin -build = x86_64-unknown-linux-gnu +build = x86_64-pc-linux-gnu build_alias = build_cpu = x86_64 build_os = linux-gnu -build_vendor = unknown +build_vendor = pc builddir = . datadir = ${datarootdir} datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} dvidir = ${docdir} exec_prefix = ${prefix} -host = x86_64-unknown-linux-gnu +host = x86_64-pc-linux-gnu host_alias = host_cpu = x86_64 host_os = linux-gnu -host_vendor = unknown +host_vendor = pc htmldir = ${docdir} infodir = ${datarootdir}/info -install_sh = ${SHELL} /run/media/echappa/Work/alpine/alpinegit/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec +install_sh = ${SHELL} /run/media/echappa/Alpine/alpine/alpinegit/install-sh +libdir = ${exec_prefix}/lib64 +libexecdir = ${exec_prefix}/lib localedir = ${datadir}/locale localstatedir = ${prefix}/var lt_ECHO = @lt_ECHO@ -- cgit v1.2.3-70-g09d2