From 6338e703612382251f876d5c0b13bc218ac01d22 Mon Sep 17 00:00:00 2001 From: adamyg Date: Wed, 16 Mar 2022 22:17:45 +0800 Subject: [PATCH 1/6] Merge --- mcwin32/libw32/LICENSE.txt | 25 ++++++++++++------------- mcwin32/libw32/alloca.h | 23 ++++++++++++++--------- mcwin32/libw32/dirent.h | 4 ++-- mcwin32/libw32/dlfcn.h | 23 ++++++++++++++--------- mcwin32/libw32/edidentifier.h | 23 ++++++++++++++--------- mcwin32/libw32/err.h | 25 +++++++++++++++---------- mcwin32/libw32/getopt.h | 4 ++-- mcwin32/libw32/grp.h | 3 ++- mcwin32/libw32/langinfo.h | 5 ++--- mcwin32/libw32/libgen.h | 3 ++- mcwin32/libw32/libw32.h | 3 ++- mcwin32/libw32/libw32_version.h | 1 + mcwin32/libw32/netdb.h | 3 ++- mcwin32/libw32/netinet/in.h | 9 ++++----- mcwin32/libw32/netinet/tcp.h | 8 ++++---- mcwin32/libw32/package.h.in | 4 ++-- mcwin32/libw32/poll.h | 3 ++- mcwin32/libw32/pwd.h | 3 ++- mcwin32/libw32/slang.h | 1 + mcwin32/libw32/sys/cdefs.h | 6 +++++- mcwin32/libw32/sys/mman.h | 3 +-- mcwin32/libw32/sys/poll.h | 24 ++++++++++++++---------- mcwin32/libw32/sys/select.h | 24 ++++++++++++++---------- mcwin32/libw32/sys/time.h | 9 ++++----- mcwin32/libw32/sys/utypes.h | 3 +-- mcwin32/libw32/termemu_vio.c | 1 + mcwin32/libw32/termemu_vio.h | 3 ++- mcwin32/libw32/unistd.h | 7 ++++--- mcwin32/libw32/w32_access.c | 6 +++--- mcwin32/libw32/w32_check.c | 3 ++- mcwin32/libw32/w32_child.c | 10 +++++++++- mcwin32/libw32/w32_chmod.c | 3 ++- mcwin32/libw32/w32_chown.c | 3 ++- mcwin32/libw32/w32_close.c | 10 +++++++++- mcwin32/libw32/w32_colors256.h | 1 + mcwin32/libw32/w32_dir.c | 3 ++- mcwin32/libw32/w32_dirent.c | 3 ++- mcwin32/libw32/w32_direntunc.c | 3 ++- mcwin32/libw32/w32_dlfcn.c | 3 ++- mcwin32/libw32/w32_domainname.c | 5 +++-- mcwin32/libw32/w32_errno.c | 10 +++++++++- mcwin32/libw32/w32_fallocate.c | 3 ++- mcwin32/libw32/w32_fcntl.c | 3 ++- mcwin32/libw32/w32_flock.c | 3 ++- mcwin32/libw32/w32_fsync.c | 3 ++- mcwin32/libw32/w32_getcwd.c | 3 ++- mcwin32/libw32/w32_getcwdd.c | 3 ++- mcwin32/libw32/w32_gethostname.c | 3 ++- mcwin32/libw32/w32_getlocale.c | 3 ++- mcwin32/libw32/w32_getrusage.c | 3 ++- mcwin32/libw32/w32_gistrerror.c | 3 ++- mcwin32/libw32/w32_grp.c | 3 ++- mcwin32/libw32/w32_iconv.c | 23 ++++++++++++++--------- mcwin32/libw32/w32_ino.c | 3 ++- mcwin32/libw32/w32_io.c | 23 ++++++++++++++--------- mcwin32/libw32/w32_itimer.c | 27 +++++++++++++-------------- mcwin32/libw32/w32_langinfo.c | 27 +++++++++++++-------------- mcwin32/libw32/w32_link.c | 3 ++- mcwin32/libw32/w32_mknod.c | 27 +++++++++++++-------------- mcwin32/libw32/w32_mkstemp.c | 23 ++++++++++++++--------- mcwin32/libw32/w32_mmap.c | 26 ++++++++++++++++---------- mcwin32/libw32/w32_neterr.c | 25 +++++++++++++++---------- mcwin32/libw32/w32_poll.c | 26 +++++++++++++++----------- mcwin32/libw32/w32_popen.c | 23 ++++++++++++++--------- mcwin32/libw32/w32_progname.c | 26 ++++++++++++++++---------- mcwin32/libw32/w32_pwd.c | 26 ++++++++++++++++---------- mcwin32/libw32/w32_read.c | 26 ++++++++++++++++---------- mcwin32/libw32/w32_readv.c | 23 ++++++++++++++--------- mcwin32/libw32/w32_realpath.c | 29 +++++++++++++---------------- mcwin32/libw32/w32_rename.c | 3 ++- mcwin32/libw32/w32_reparse.c | 27 +++++++++++++-------------- mcwin32/libw32/w32_rwlock.c | 27 +++++++++++++-------------- mcwin32/libw32/w32_select.c | 27 +++++++++++++-------------- mcwin32/libw32/w32_shell.c | 26 ++++++++++++++++---------- mcwin32/libw32/w32_signal.c | 27 +++++++++++++-------------- mcwin32/libw32/w32_slang.c | 25 ++++++++++++------------- mcwin32/libw32/w32_sockbase.c | 3 ++- mcwin32/libw32/w32_socket.c | 3 ++- mcwin32/libw32/w32_socket2.c | 3 ++- mcwin32/libw32/w32_sockfd.c | 3 ++- mcwin32/libw32/w32_sockpair.c | 23 ++++++++++++++--------- mcwin32/libw32/w32_statfs.c | 23 ++++++++++++++--------- mcwin32/libw32/w32_strftime.c | 2 +- mcwin32/libw32/w32_string.c | 27 +++++++++++++-------------- mcwin32/libw32/w32_strlcat.c | 28 +++++++++++++--------------- mcwin32/libw32/w32_strlcpy.c | 29 +++++++++++++---------------- mcwin32/libw32/w32_strtoll.c | 2 +- mcwin32/libw32/w32_strtoull.c | 2 +- mcwin32/libw32/w32_sysdir.c | 27 +++++++++++++-------------- mcwin32/libw32/w32_time.c | 3 ++- mcwin32/libw32/w32_truncate.c | 3 ++- mcwin32/libw32/w32_uname.c | 27 +++++++++++++-------------- mcwin32/libw32/w32_unlink.c | 3 ++- mcwin32/libw32/w32_user.c | 3 ++- mcwin32/libw32/w32_util.c | 3 ++- mcwin32/libw32/w32_wdirent.c | 5 +++-- mcwin32/libw32/w32_write.c | 27 +++++++++++++-------------- mcwin32/libw32/w32_writev.c | 30 ++++++++++++++---------------- mcwin32/libw32/w32config.hin | 2 +- mcwin32/libw32/win32_cdef.h | 1 + mcwin32/libw32/win32_child.h | 3 ++- mcwin32/libw32/win32_direct.h | 21 +++++++++++++-------- mcwin32/libw32/win32_errno.h | 3 ++- mcwin32/libw32/win32_iconv.h | 24 ++++++++++++++---------- mcwin32/libw32/win32_include.h | 3 ++- mcwin32/libw32/win32_internal.h | 3 ++- mcwin32/libw32/win32_io.h | 16 ++++++++++------ mcwin32/libw32/win32_ioctl.h | 5 +++-- mcwin32/libw32/win32_misc.h | 3 ++- mcwin32/libw32/win32_time.h | 3 ++- 110 files changed, 715 insertions(+), 548 deletions(-) diff --git a/mcwin32/libw32/LICENSE.txt b/mcwin32/libw32/LICENSE.txt index a5bf0051..e3de3b4b 100644 --- a/mcwin32/libw32/LICENSE.txt +++ b/mcwin32/libw32/LICENSE.txt @@ -1,27 +1,26 @@ -Windows minimal posix implementation for Midnight Commander. +Windows minimal POSIX implementation. This library fills a few holes which are not generally provided by run-time libraries of native WIN32 compiler chains. -Copyright (c) 2007, 2012-2021, Adam Young. +Copyright (c) 2007, 2012-2022, Adam Young. +All rights reserved. ------------------------------------------------------------ -This file is part of the Midnight Commander. +Redistributions of source code must retain the above copyright +notice, and must be distributed with the project license document. -The Midnight Commander is free software: you can redistribute it -and/or modify it under the terms of the GNU General Public License as -published by the Free Software Foundation, either version 3 of the License, -or (at your option) any later version. +Redistributions in binary form must reproduce the above copyright +notice, and must include the license document above in +the documentation and/or other materials provided with the +distribution. -The Midnight Commander is distributed in the hope that it will be useful, +The applications are distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +License for more details. ------------------------------------------------------------ diff --git a/mcwin32/libw32/alloca.h b/mcwin32/libw32/alloca.h index 5defa9b2..2fa1d502 100644 --- a/mcwin32/libw32/alloca.h +++ b/mcwin32/libw32/alloca.h @@ -1,7 +1,7 @@ #ifndef LIBW32_ALLOCA_H_INCLUDED #define LIBW32_ALLOCA_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_alloca_h,"$Id: alloca.h,v 1.5 2022/02/17 16:04:58 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_alloca_h,"$Id: alloca.h,v 1.6 2022/03/16 13:46:58 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ @@ -12,18 +12,23 @@ __CPRAGMA_ONCE * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. + * + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== */ diff --git a/mcwin32/libw32/dirent.h b/mcwin32/libw32/dirent.h index df767fe3..f5b03dbd 100644 --- a/mcwin32/libw32/dirent.h +++ b/mcwin32/libw32/dirent.h @@ -1,7 +1,7 @@ #ifndef LIBW32_DIRENT_H_INCLUDED #define LIBW32_DIRENT_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_dirent_h,"$Id: dirent.h,v 1.13 2022/02/17 16:04:58 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_dirent_h,"$Id: dirent.h,v 1.14 2022/03/16 13:46:58 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ @@ -16,6 +16,7 @@ __CPRAGMA_ONCE * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. @@ -237,4 +238,3 @@ LIBW32_API int getdirentries __P((int, char *, int, long *)); __END_DECLS #endif /*LIBW32_DIRENT_H_INCLUDED*/ - diff --git a/mcwin32/libw32/dlfcn.h b/mcwin32/libw32/dlfcn.h index b2d787f2..22b13aed 100644 --- a/mcwin32/libw32/dlfcn.h +++ b/mcwin32/libw32/dlfcn.h @@ -1,7 +1,7 @@ #ifndef GR_DLFCN_H_INCLUDED #define GR_DLFCN_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_dlfcn_h,"$Id: dlfcn.h,v 1.2 2021/11/30 13:06:19 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_dlfcn_h,"$Id: dlfcn.h,v 1.3 2022/03/16 13:46:58 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ @@ -13,18 +13,23 @@ __CPRAGMA_ONCE * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. + * + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== */ diff --git a/mcwin32/libw32/edidentifier.h b/mcwin32/libw32/edidentifier.h index 0d516ff2..5c4c150a 100644 --- a/mcwin32/libw32/edidentifier.h +++ b/mcwin32/libw32/edidentifier.h @@ -2,7 +2,7 @@ #define LIBW32_EDIDENTIFIER_H_INCLUDED /* -*- mode: c; indent-width: 4; -*- */ -/* $Id: edidentifier.h,v 1.4 2022/02/17 16:04:58 cvsuser Exp $ +/* $Id: edidentifier.h,v 1.5 2022/03/16 13:46:58 cvsuser Exp $ * Compiler specific object identify functionality. * * __CIDENT(description) @@ -14,18 +14,23 @@ * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. + * + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== */ diff --git a/mcwin32/libw32/err.h b/mcwin32/libw32/err.h index 0fd09100..e98fe724 100644 --- a/mcwin32/libw32/err.h +++ b/mcwin32/libw32/err.h @@ -1,7 +1,7 @@ #ifndef LIBW32_ERR_H_INCLUDED #define LIBW32_ERR_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_err_h,"$Id: err.h,v 1.2 2021/04/13 15:49:34 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_err_h,"$Id: err.h,v 1.3 2022/03/16 13:46:58 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ @@ -13,18 +13,23 @@ __CPRAGMA_ONCE * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. + * + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== */ @@ -50,4 +55,4 @@ LIBW32_API void verrx(int eval, const char *fmt, va_list ap); __END_DECLS -#endif /*WIN32_ERR_H_INCLUDED*/ +#endif /*LIBW32_ERR_H_INCLUDED*/ diff --git a/mcwin32/libw32/getopt.h b/mcwin32/libw32/getopt.h index 148add34..9d8818ba 100644 --- a/mcwin32/libw32/getopt.h +++ b/mcwin32/libw32/getopt.h @@ -1,7 +1,7 @@ #ifndef LIBW32_GETOPT_H_INCLUDED #define LIBW32_GETOPT_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_getopt_h,"$Id: getopt.h,v 1.7 2021/04/13 15:49:34 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_getopt_h,"$Id: getopt.h,v 1.8 2022/03/16 13:46:58 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ /* @@ -15,6 +15,7 @@ __CPRAGMA_ONCE * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. @@ -66,4 +67,3 @@ LIBW32_API int getopt_long2(int argvc, char * const *argv, const char * __END_DECLS #endif /*LIBW32_GETOPT_H_INCLUDED*/ - diff --git a/mcwin32/libw32/grp.h b/mcwin32/libw32/grp.h index 27ca515c..9683bed7 100644 --- a/mcwin32/libw32/grp.h +++ b/mcwin32/libw32/grp.h @@ -1,7 +1,7 @@ #ifndef LIBW32_GRP_H_INCLUDED #define LIBW32_GRP_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_grp_h,"$Id: grp.h,v 1.8 2022/02/17 16:04:58 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_grp_h,"$Id: grp.h,v 1.9 2022/03/16 13:46:58 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ @@ -16,6 +16,7 @@ __CPRAGMA_ONCE * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/langinfo.h b/mcwin32/libw32/langinfo.h index 7f6dbd63..cb4a45ce 100644 --- a/mcwin32/libw32/langinfo.h +++ b/mcwin32/libw32/langinfo.h @@ -1,7 +1,7 @@ #ifndef LIBW32_LANGINFO_H_INCLUDED #define LIBW32_LANGINFO_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_langinfo_h,"$Id: langinfo.h,v 1.5 2022/02/17 16:04:58 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_langinfo_h,"$Id: langinfo.h,v 1.6 2022/03/16 13:46:58 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ @@ -12,11 +12,10 @@ __CPRAGMA_ONCE * * This file is part of the Midnight Commander. * - * This file is part of the Midnight Commander. - * * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/libgen.h b/mcwin32/libw32/libgen.h index a9509ad6..0153e313 100644 --- a/mcwin32/libw32/libgen.h +++ b/mcwin32/libw32/libgen.h @@ -1,7 +1,7 @@ #ifndef LIBW32_LIBGEN_H_INCLUDED #define LIBW32_LIBGEN_H_INCLUDED #include -__CIDENT_RCSID(gr_libgen_h,"$Id: libgen.h,v 1.3 2022/02/17 16:04:58 cvsuser Exp $") +__CIDENT_RCSID(gr_libgen_h,"$Id: libgen.h,v 1.4 2022/03/16 13:46:58 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ @@ -15,6 +15,7 @@ __CPRAGMA_ONCE * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/libw32.h b/mcwin32/libw32/libw32.h index ac621d49..40d60e16 100644 --- a/mcwin32/libw32/libw32.h +++ b/mcwin32/libw32/libw32.h @@ -11,6 +11,7 @@ * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. @@ -36,4 +37,4 @@ #include #include -#endif /*LIBW32_WIN32_H_INCLUDED*/ +#endif /*LIBW32_LIBW32_H_INCLUDED*/ diff --git a/mcwin32/libw32/libw32_version.h b/mcwin32/libw32/libw32_version.h index 8c3bd483..32feccdd 100644 --- a/mcwin32/libw32/libw32_version.h +++ b/mcwin32/libw32/libw32_version.h @@ -8,6 +8,7 @@ * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/netdb.h b/mcwin32/libw32/netdb.h index 3dc86fd8..b6294b22 100644 --- a/mcwin32/libw32/netdb.h +++ b/mcwin32/libw32/netdb.h @@ -1,7 +1,7 @@ #ifndef LIBW32_NETDB_H_INCLUDED #define LIBW32_NETDB_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_netdb_h,"$Id: netdb.h,v 1.7 2022/02/17 16:04:58 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_netdb_h,"$Id: netdb.h,v 1.8 2022/03/16 13:46:58 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ @@ -15,6 +15,7 @@ __CPRAGMA_ONCE * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/netinet/in.h b/mcwin32/libw32/netinet/in.h index 204edc3b..c3b9a082 100644 --- a/mcwin32/libw32/netinet/in.h +++ b/mcwin32/libw32/netinet/in.h @@ -1,7 +1,7 @@ -#ifndef LIBW32_SYS_IN_H_INCLUDED -#define LIBW32_SYS_IN_H_INCLUDED +#ifndef LIBW32_NETINET_IN_H_INCLUDED +#define LIBW32_NETINET_IN_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_netinet_in_h,"$Id: in.h,v 1.4 2022/03/01 13:19:56 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_netinet_in_h,"$Id: in.h,v 1.5 2022/03/16 13:47:01 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ @@ -31,5 +31,4 @@ __CPRAGMA_ONCE #include #include /* winsock and windows.h guard */ -#endif /*LIBW32_SYS_IN_H_INCLUDED*/ - +#endif /*LIBW32_NETINET_IN_H_INCLUDED*/ diff --git a/mcwin32/libw32/netinet/tcp.h b/mcwin32/libw32/netinet/tcp.h index 84e8ebed..d1d39141 100644 --- a/mcwin32/libw32/netinet/tcp.h +++ b/mcwin32/libw32/netinet/tcp.h @@ -1,7 +1,7 @@ -#ifndef LIBW32_SYS_TCP_H_INCLUDED -#define LIBW32_SYS_TCP_H_INCLUDED +#ifndef LIBW32_NETINET_TCP_H_INCLUDED +#define LIBW32_NETINET_TCP_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_netinet_tcp_h,"$Id: tcp.h,v 1.4 2022/03/01 13:19:56 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_netinet_tcp_h,"$Id: tcp.h,v 1.5 2022/03/16 13:47:01 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ @@ -37,4 +37,4 @@ __CPRAGMA_ONCE #include #include /* winsock and windows.h guard */ -#endif /*LIBW32_SYS_TCP_H_INCLUDED*/ +#endif /*LIBW32_NETINET_TCP_H_INCLUDED*/ diff --git a/mcwin32/libw32/package.h.in b/mcwin32/libw32/package.h.in index 44beeb24..fd7cb0ba 100644 --- a/mcwin32/libw32/package.h.in +++ b/mcwin32/libw32/package.h.in @@ -1,11 +1,11 @@ #ifndef GR_EDPACKAGE_H_INCLUDED #define GR_EDPACKAGE_H_INCLUDED #include -__CIDENT_RCSID(edpackage_h, "$Id: package.h.in,v 1.2 2018/09/29 02:22:53 cvsuser Exp $") +__CIDENT_RCSID(edpackage_h, "$Id: package.h.in,v 1.3 2022/03/16 13:46:58 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: h; set-indent: 4; -*- */ -/* $Id: package.h.in,v 1.2 2018/09/29 02:22:53 cvsuser Exp $ +/* $Id: package.h.in,v 1.3 2022/03/16 13:46:58 cvsuser Exp $ * Package configuration. * * diff --git a/mcwin32/libw32/poll.h b/mcwin32/libw32/poll.h index b052df05..2868677a 100644 --- a/mcwin32/libw32/poll.h +++ b/mcwin32/libw32/poll.h @@ -1,7 +1,7 @@ #ifndef LIBW32_POLL_H_INCLUDED #define LIBW32_POLL_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_poll_h,"$Id: poll.h,v 1.7 2022/02/17 16:04:59 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_poll_h,"$Id: poll.h,v 1.8 2022/03/16 13:46:58 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ @@ -15,6 +15,7 @@ __CPRAGMA_ONCE * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/pwd.h b/mcwin32/libw32/pwd.h index bf7237dc..afc6ebf7 100644 --- a/mcwin32/libw32/pwd.h +++ b/mcwin32/libw32/pwd.h @@ -1,7 +1,7 @@ #ifndef LIBW32_PWD_H_INCLUDED #define LIBW32_PWD_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_pwd_h,"$Id: pwd.h,v 1.9 2022/02/17 16:04:59 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_pwd_h,"$Id: pwd.h,v 1.10 2022/03/16 13:46:58 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ @@ -15,6 +15,7 @@ __CPRAGMA_ONCE * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/slang.h b/mcwin32/libw32/slang.h index 5a808d0c..22dfdaa3 100644 --- a/mcwin32/libw32/slang.h +++ b/mcwin32/libw32/slang.h @@ -11,6 +11,7 @@ * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/sys/cdefs.h b/mcwin32/libw32/sys/cdefs.h index c6cd572b..bfb39db4 100644 --- a/mcwin32/libw32/sys/cdefs.h +++ b/mcwin32/libw32/sys/cdefs.h @@ -1,7 +1,7 @@ #ifndef LIBW32_SYS_CDEFS_H_INCLUDED #define LIBW32_SYS_CDEFS_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_sys_cdefs_h,"$Id: cdefs.h,v 1.6 2022/02/24 15:33:51 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_sys_cdefs_h,"$Id: cdefs.h,v 1.7 2022/03/16 13:47:01 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- @@ -44,6 +44,10 @@ __CPRAGMA_ONCE */ #if !defined(LIBW32_API) +#if defined(LIBW32_DYNAMIC) && defined(LIBW32_STATIC) +#error LIBW32_DYNAMIC and LIBW32_STATIC are mutually exclusive +#endif + #if defined(LIBW32_DYNAMIC) #if defined(LIBW32_LIBRARY) /* library source */ #define LIBW32_API __declspec(dllexport) diff --git a/mcwin32/libw32/sys/mman.h b/mcwin32/libw32/sys/mman.h index cb701e7a..fd5e83ac 100644 --- a/mcwin32/libw32/sys/mman.h +++ b/mcwin32/libw32/sys/mman.h @@ -1,7 +1,7 @@ #ifndef LIBW32_SYS_MMAN_H_INCLUDED #define LIBW32_SYS_MMAN_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_sys_mman_h,"$Id: mman.h,v 1.6 2022/02/24 15:33:51 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_sys_mman_h,"$Id: mman.h,v 1.7 2022/03/16 13:47:01 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ @@ -83,4 +83,3 @@ LIBW32_API int munlock __P((const void *, size_t)); __END_DECLS #endif /*LIBW32_SYS_MMAN_H_INCLUDED*/ - diff --git a/mcwin32/libw32/sys/poll.h b/mcwin32/libw32/sys/poll.h index 4972ea54..2e139f62 100644 --- a/mcwin32/libw32/sys/poll.h +++ b/mcwin32/libw32/sys/poll.h @@ -1,7 +1,7 @@ #ifndef LIBW32_SYS_POLL_H_INCLUDED #define LIBW32_SYS_POLL_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_sys_poll_h,"$Id: poll.h,v 1.3 2022/02/24 15:33:51 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_sys_poll_h,"$Id: poll.h,v 1.4 2022/03/16 13:47:01 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ @@ -11,18 +11,22 @@ __CPRAGMA_ONCE * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. + * published by the Free Software Foundation, version 3. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. + * + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * License for more details. * ==end== */ diff --git a/mcwin32/libw32/sys/select.h b/mcwin32/libw32/sys/select.h index 16c04767..2e58499e 100644 --- a/mcwin32/libw32/sys/select.h +++ b/mcwin32/libw32/sys/select.h @@ -1,7 +1,7 @@ #ifndef LIBW32_SYS_SELECT_H_INCLUDED #define LIBW32_SYS_SELECT_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_sys_select_h,"$Id: select.h,v 1.5 2022/02/24 15:33:51 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_sys_select_h,"$Id: select.h,v 1.6 2022/03/16 13:47:01 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ @@ -11,18 +11,22 @@ __CPRAGMA_ONCE * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. + * published by the Free Software Foundation, version 3. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. + * + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * License for more details. * ==end== */ diff --git a/mcwin32/libw32/sys/time.h b/mcwin32/libw32/sys/time.h index f807b968..8b1c7eb2 100644 --- a/mcwin32/libw32/sys/time.h +++ b/mcwin32/libw32/sys/time.h @@ -1,7 +1,7 @@ -#ifndef LIBW32_SYS_TIME_H -#define LIBW32_SYS_TIME_H +#ifndef LIBW32_SYS_TIME_H_INCLUDED +#define LIBW32_SYS_TIME_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_sys_time_h,"$Id: time.h,v 1.7 2022/02/24 15:33:51 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_sys_time_h,"$Id: time.h,v 1.8 2022/03/16 13:47:01 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ @@ -150,5 +150,4 @@ LIBW32_API struct tm * gmtime_r(const time_t *ctm, struct tm *res); __END_DECLS -#endif /*LIBW32_SYS_TIME_H*/ - +#endif /*LIBW32_SYS_TIME_H_INCLUDED*/ diff --git a/mcwin32/libw32/sys/utypes.h b/mcwin32/libw32/sys/utypes.h index 90e84aae..5c4a4bdb 100644 --- a/mcwin32/libw32/sys/utypes.h +++ b/mcwin32/libw32/sys/utypes.h @@ -1,7 +1,7 @@ #ifndef LIBW32_SYS_UTYPES_H_INCLUDED #define LIBW32_SYS_UTYPES_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_sys_utypes_h,"$Id: utypes.h,v 1.17 2022/02/24 16:38:56 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_sys_utypes_h,"$Id: utypes.h,v 1.18 2022/03/16 13:47:01 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ @@ -12,7 +12,6 @@ __CPRAGMA_ONCE * All rights reserved. * * This file is part of the Midnight Commander. - * * The Midnight Commander is free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the License, diff --git a/mcwin32/libw32/termemu_vio.c b/mcwin32/libw32/termemu_vio.c index c89f2649..9025fc1b 100644 --- a/mcwin32/libw32/termemu_vio.c +++ b/mcwin32/libw32/termemu_vio.c @@ -9,6 +9,7 @@ * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/termemu_vio.h b/mcwin32/libw32/termemu_vio.h index 2d293900..43ec9eaa 100644 --- a/mcwin32/libw32/termemu_vio.h +++ b/mcwin32/libw32/termemu_vio.h @@ -1,7 +1,7 @@ #ifndef TERMEMU_VIO_H_INCLUDED #define TERMEMU_VIO_H_INCLUDED #include -__CIDENT_RCSID(termemu_vio_h,"$Id: termemu_vio.h,v 1.5 2022/02/17 16:04:59 cvsuser Exp $") +__CIDENT_RCSID(termemu_vio_h,"$Id: termemu_vio.h,v 1.6 2022/03/16 13:46:59 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ @@ -15,6 +15,7 @@ __CPRAGMA_ONCE * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/unistd.h b/mcwin32/libw32/unistd.h index 906d5398..b89e94fd 100644 --- a/mcwin32/libw32/unistd.h +++ b/mcwin32/libw32/unistd.h @@ -1,7 +1,7 @@ #ifndef LIBW32_UNISTD_H_INCLUDED #define LIBW32_UNISTD_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_unistd_h,"$Id: unistd.h,v 1.33 2022/02/24 15:17:47 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_unistd_h,"$Id: unistd.h,v 1.34 2022/03/16 13:46:59 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ @@ -12,11 +12,10 @@ __CPRAGMA_ONCE * * This file is part of the Midnight Commander. * - * This file is part of the Midnight Commander. - * * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. @@ -443,6 +442,8 @@ LIBW32_API int WIFSTOPPED(int status); #endif /* */ +LIBW32_API extern char *suboptarg; + LIBW32_API int getsubopt (char **optionp, char * const *tokens, char **valuep); /* */ diff --git a/mcwin32/libw32/w32_access.c b/mcwin32/libw32/w32_access.c index 61b387b7..cb1614ef 100644 --- a/mcwin32/libw32/w32_access.c +++ b/mcwin32/libw32/w32_access.c @@ -1,19 +1,19 @@ #include -__CIDENT_RCSID(gr_w32_access_c,"$Id: w32_access.c,v 1.2 2021/11/30 13:06:19 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_access_c,"$Id: w32_access.c,v 1.3 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* * win2 access() system calls * - * Copyright (c) 2021 Adam Young. + * Copyright (c) 2021 - 2022 Adam Young. * All rights reserved. * - * * This file is part of the Midnight Commander. * * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_check.c b/mcwin32/libw32/w32_check.c index 3fd3d1b9..316edde0 100644 --- a/mcwin32/libw32/w32_check.c +++ b/mcwin32/libw32/w32_check.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_check_c,"$Id: w32_check.c,v 1.10 2022/02/17 16:04:59 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_check_c,"$Id: w32_check.c,v 1.11 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -13,6 +13,7 @@ __CIDENT_RCSID(gr_w32_check_c,"$Id: w32_check.c,v 1.10 2022/02/17 16:04:59 cvsus * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_child.c b/mcwin32/libw32/w32_child.c index ff7488e3..76ba3599 100644 --- a/mcwin32/libw32/w32_child.c +++ b/mcwin32/libw32/w32_child.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_child_c,"$Id: w32_child.c,v 1.15 2022/02/17 16:04:59 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_child_c,"$Id: w32_child.c,v 1.16 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -12,6 +12,7 @@ __CIDENT_RCSID(gr_w32_child_c,"$Id: w32_child.c,v 1.15 2022/02/17 16:04:59 cvsus * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. @@ -26,6 +27,13 @@ __CIDENT_RCSID(gr_w32_child_c,"$Id: w32_child.c,v 1.15 2022/02/17 16:04:59 cvsus * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * license for more details. * ==end== + * + * Notice: Portions of this text are reprinted and reproduced in electronic form. from + * IEEE Portable Operating System Interface (POSIX), for reference only. Copyright (C) + * 2001-2003 by the Institute of. Electrical and Electronics Engineers, Inc and The Open + * Group. Copyright remains with the authors and the original Standard can be obtained + * online at http://www.opengroup.org/unix/online.html. + * ==extra== */ #include "win32_internal.h" diff --git a/mcwin32/libw32/w32_chmod.c b/mcwin32/libw32/w32_chmod.c index f3d540b9..125ec697 100644 --- a/mcwin32/libw32/w32_chmod.c +++ b/mcwin32/libw32/w32_chmod.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_chmod_c,"$Id: w32_chmod.c,v 1.4 2021/05/24 15:10:33 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_chmod_c,"$Id: w32_chmod.c,v 1.5 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -12,6 +12,7 @@ __CIDENT_RCSID(gr_w32_chmod_c,"$Id: w32_chmod.c,v 1.4 2021/05/24 15:10:33 cvsuse * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_chown.c b/mcwin32/libw32/w32_chown.c index 1457a9fc..3b63d51f 100644 --- a/mcwin32/libw32/w32_chown.c +++ b/mcwin32/libw32/w32_chown.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_chown_c,"$Id: w32_chown.c,v 1.9 2022/02/17 16:04:59 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_chown_c,"$Id: w32_chown.c,v 1.10 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -12,6 +12,7 @@ __CIDENT_RCSID(gr_w32_chown_c,"$Id: w32_chown.c,v 1.9 2022/02/17 16:04:59 cvsuse * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_close.c b/mcwin32/libw32/w32_close.c index b4ef64dc..41b9363d 100644 --- a/mcwin32/libw32/w32_close.c +++ b/mcwin32/libw32/w32_close.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_close_c,"$Id: w32_close.c,v 1.10 2022/02/17 16:04:59 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_close_c,"$Id: w32_close.c,v 1.11 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -13,6 +13,7 @@ __CIDENT_RCSID(gr_w32_close_c,"$Id: w32_close.c,v 1.10 2022/02/17 16:04:59 cvsus * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. @@ -27,6 +28,13 @@ __CIDENT_RCSID(gr_w32_close_c,"$Id: w32_close.c,v 1.10 2022/02/17 16:04:59 cvsus * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * license for more details. * ==end== + * + * Notice: Portions of this text are reprinted and reproduced in electronic form. from + * IEEE Portable Operating System Interface (POSIX), for reference only. Copyright (C) + * 2001-2003 by the Institute of. Electrical and Electronics Engineers, Inc and The Open + * Group. Copyright remains with the authors and the original Standard can be obtained + * online at http://www.opengroup.org/unix/online.html. + * ==extra== */ #ifndef _WIN32_WINNT diff --git a/mcwin32/libw32/w32_colors256.h b/mcwin32/libw32/w32_colors256.h index 8589cb9a..431009a6 100644 --- a/mcwin32/libw32/w32_colors256.h +++ b/mcwin32/libw32/w32_colors256.h @@ -10,6 +10,7 @@ * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_dir.c b/mcwin32/libw32/w32_dir.c index e9abf45e..08411902 100644 --- a/mcwin32/libw32/w32_dir.c +++ b/mcwin32/libw32/w32_dir.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_dir_c, "$Id: w32_dir.c,v 1.21 2022/02/17 16:04:59 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_dir_c, "$Id: w32_dir.c,v 1.22 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -15,6 +15,7 @@ __CIDENT_RCSID(gr_w32_dir_c, "$Id: w32_dir.c,v 1.21 2022/02/17 16:04:59 cvsuser * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_dirent.c b/mcwin32/libw32/w32_dirent.c index 4bdce33a..861dfbd4 100644 --- a/mcwin32/libw32/w32_dirent.c +++ b/mcwin32/libw32/w32_dirent.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_dirent_c,"$Id: w32_dirent.c,v 1.23 2022/02/17 16:04:59 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_dirent_c,"$Id: w32_dirent.c,v 1.24 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -14,6 +14,7 @@ __CIDENT_RCSID(gr_w32_dirent_c,"$Id: w32_dirent.c,v 1.23 2022/02/17 16:04:59 cvs * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_direntunc.c b/mcwin32/libw32/w32_direntunc.c index 6a36a0f8..ca93e0a0 100644 --- a/mcwin32/libw32/w32_direntunc.c +++ b/mcwin32/libw32/w32_direntunc.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_direntunc_c,"$Id: w32_direntunc.c,v 1.5 2022/02/17 16:04:59 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_direntunc_c,"$Id: w32_direntunc.c,v 1.6 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -12,6 +12,7 @@ __CIDENT_RCSID(gr_w32_direntunc_c,"$Id: w32_direntunc.c,v 1.5 2022/02/17 16:04:5 * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_dlfcn.c b/mcwin32/libw32/w32_dlfcn.c index 23ffa537..b0f7152e 100644 --- a/mcwin32/libw32/w32_dlfcn.c +++ b/mcwin32/libw32/w32_dlfcn.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_dlfcn_c,"$Id: w32_dlfcn.c,v 1.2 2021/11/30 13:06:19 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_dlfcn_c,"$Id: w32_dlfcn.c,v 1.3 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -14,6 +14,7 @@ __CIDENT_RCSID(gr_w32_dlfcn_c,"$Id: w32_dlfcn.c,v 1.2 2021/11/30 13:06:19 cvsuse * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_domainname.c b/mcwin32/libw32/w32_domainname.c index fc31ab13..5bed583c 100644 --- a/mcwin32/libw32/w32_domainname.c +++ b/mcwin32/libw32/w32_domainname.c @@ -1,11 +1,11 @@ #include -__CIDENT_RCSID(gr_w32_getdomainname_c,"$Id: w32_domainname.c,v 1.2 2021/04/13 15:49:34 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_getdomainname_c,"$Id: w32_domainname.c,v 1.3 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* * win32 getdomainname() * - * Copyright (c) 2017, Adam Young. + * Copyright (c) 2017 - 2022 Adam Young. * All rights reserved. * * This file is part of the Midnight Commander. @@ -13,6 +13,7 @@ __CIDENT_RCSID(gr_w32_getdomainname_c,"$Id: w32_domainname.c,v 1.2 2021/04/13 15 * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_errno.c b/mcwin32/libw32/w32_errno.c index ed41acb2..143f7658 100644 --- a/mcwin32/libw32/w32_errno.c +++ b/mcwin32/libw32/w32_errno.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_errno_c,"$Id: w32_errno.c,v 1.10 2022/02/17 16:04:59 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_errno_c,"$Id: w32_errno.c,v 1.11 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -13,6 +13,7 @@ __CIDENT_RCSID(gr_w32_errno_c,"$Id: w32_errno.c,v 1.10 2022/02/17 16:04:59 cvsus * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. @@ -27,6 +28,13 @@ __CIDENT_RCSID(gr_w32_errno_c,"$Id: w32_errno.c,v 1.10 2022/02/17 16:04:59 cvsus * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * license for more details. * ==end== + * + * Notice: Portions of this text are reprinted and reproduced in electronic form. from + * IEEE Portable Operating System Interface (POSIX), for reference only. Copyright (C) + * 2001-2003 by the Institute of. Electrical and Electronics Engineers, Inc and The Open + * Group. Copyright remains with the authors and the original Standard can be obtained + * online at http://www.opengroup.org/unix/online.html. + * ==extra== */ #include "win32_internal.h" diff --git a/mcwin32/libw32/w32_fallocate.c b/mcwin32/libw32/w32_fallocate.c index 739531cc..5498c58d 100644 --- a/mcwin32/libw32/w32_fallocate.c +++ b/mcwin32/libw32/w32_fallocate.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_fallocate_c, "$Id: w32_fallocate.c,v 1.4 2022/02/17 16:04:59 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_fallocate_c, "$Id: w32_fallocate.c,v 1.5 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -12,6 +12,7 @@ __CIDENT_RCSID(gr_w32_fallocate_c, "$Id: w32_fallocate.c,v 1.4 2022/02/17 16:04: * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_fcntl.c b/mcwin32/libw32/w32_fcntl.c index 7d427522..3f501537 100644 --- a/mcwin32/libw32/w32_fcntl.c +++ b/mcwin32/libw32/w32_fcntl.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_fcntl_c,"$Id: w32_fcntl.c,v 1.9 2022/02/17 16:04:59 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_fcntl_c,"$Id: w32_fcntl.c,v 1.10 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -12,6 +12,7 @@ __CIDENT_RCSID(gr_w32_fcntl_c,"$Id: w32_fcntl.c,v 1.9 2022/02/17 16:04:59 cvsuse * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_flock.c b/mcwin32/libw32/w32_flock.c index 5dbc32bd..24f80f87 100644 --- a/mcwin32/libw32/w32_flock.c +++ b/mcwin32/libw32/w32_flock.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_flock_c,"$Id: w32_flock.c,v 1.2 2021/11/30 13:06:19 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_flock_c,"$Id: w32_flock.c,v 1.3 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -13,6 +13,7 @@ __CIDENT_RCSID(gr_w32_flock_c,"$Id: w32_flock.c,v 1.2 2021/11/30 13:06:19 cvsuse * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_fsync.c b/mcwin32/libw32/w32_fsync.c index 85476d68..5b3888b7 100644 --- a/mcwin32/libw32/w32_fsync.c +++ b/mcwin32/libw32/w32_fsync.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_fsync_c,"$Id: w32_fsync.c,v 1.10 2022/02/17 16:04:59 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_fsync_c,"$Id: w32_fsync.c,v 1.11 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -13,6 +13,7 @@ __CIDENT_RCSID(gr_w32_fsync_c,"$Id: w32_fsync.c,v 1.10 2022/02/17 16:04:59 cvsus * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_getcwd.c b/mcwin32/libw32/w32_getcwd.c index eb7071fc..9f801203 100644 --- a/mcwin32/libw32/w32_getcwd.c +++ b/mcwin32/libw32/w32_getcwd.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_getcwd_c,"$Id: w32_getcwd.c,v 1.19 2022/02/17 16:04:59 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_getcwd_c,"$Id: w32_getcwd.c,v 1.20 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -12,6 +12,7 @@ __CIDENT_RCSID(gr_w32_getcwd_c,"$Id: w32_getcwd.c,v 1.19 2022/02/17 16:04:59 cvs * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_getcwdd.c b/mcwin32/libw32/w32_getcwdd.c index 0b3cf5b2..b7133a33 100644 --- a/mcwin32/libw32/w32_getcwdd.c +++ b/mcwin32/libw32/w32_getcwdd.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_getcwdd_c,"$Id: w32_getcwdd.c,v 1.6 2022/02/17 16:04:59 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_getcwdd_c,"$Id: w32_getcwdd.c,v 1.7 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -12,6 +12,7 @@ __CIDENT_RCSID(gr_w32_getcwdd_c,"$Id: w32_getcwdd.c,v 1.6 2022/02/17 16:04:59 cv * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_gethostname.c b/mcwin32/libw32/w32_gethostname.c index 8e020c4c..3d99ecfb 100644 --- a/mcwin32/libw32/w32_gethostname.c +++ b/mcwin32/libw32/w32_gethostname.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_gethostname_c,"$Id: w32_gethostname.c,v 1.9 2021/06/10 12:42:33 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_gethostname_c,"$Id: w32_gethostname.c,v 1.10 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -13,6 +13,7 @@ __CIDENT_RCSID(gr_w32_gethostname_c,"$Id: w32_gethostname.c,v 1.9 2021/06/10 12: * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_getlocale.c b/mcwin32/libw32/w32_getlocale.c index 4f030b5d..b1846e0f 100644 --- a/mcwin32/libw32/w32_getlocale.c +++ b/mcwin32/libw32/w32_getlocale.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_getlocale_c,"$Id: w32_getlocale.c,v 1.2 2022/02/17 16:04:59 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_getlocale_c,"$Id: w32_getlocale.c,v 1.3 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -13,6 +13,7 @@ __CIDENT_RCSID(gr_w32_getlocale_c,"$Id: w32_getlocale.c,v 1.2 2022/02/17 16:04:5 * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_getrusage.c b/mcwin32/libw32/w32_getrusage.c index 4af646b2..28575dc4 100644 --- a/mcwin32/libw32/w32_getrusage.c +++ b/mcwin32/libw32/w32_getrusage.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_getrusage_c,"$Id: w32_getrusage.c,v 1.2 2021/11/30 13:06:19 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_getrusage_c,"$Id: w32_getrusage.c,v 1.3 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -13,6 +13,7 @@ __CIDENT_RCSID(gr_w32_getrusage_c,"$Id: w32_getrusage.c,v 1.2 2021/11/30 13:06:1 * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_gistrerror.c b/mcwin32/libw32/w32_gistrerror.c index 14238ebb..c35a93b5 100644 --- a/mcwin32/libw32/w32_gistrerror.c +++ b/mcwin32/libw32/w32_gistrerror.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_gistrerror_c,"$Id: w32_gistrerror.c,v 1.9 2022/02/17 16:04:59 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_gistrerror_c,"$Id: w32_gistrerror.c,v 1.10 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -13,6 +13,7 @@ __CIDENT_RCSID(gr_w32_gistrerror_c,"$Id: w32_gistrerror.c,v 1.9 2022/02/17 16:04 * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_grp.c b/mcwin32/libw32/w32_grp.c index 9b591286..02117404 100644 --- a/mcwin32/libw32/w32_grp.c +++ b/mcwin32/libw32/w32_grp.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_grp_c, "$Id: w32_grp.c,v 1.13 2022/02/17 16:04:59 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_grp_c, "$Id: w32_grp.c,v 1.14 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -13,6 +13,7 @@ __CIDENT_RCSID(gr_w32_grp_c, "$Id: w32_grp.c,v 1.13 2022/02/17 16:04:59 cvsuser * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_iconv.c b/mcwin32/libw32/w32_iconv.c index 340419fb..d0ec863c 100644 --- a/mcwin32/libw32/w32_iconv.c +++ b/mcwin32/libw32/w32_iconv.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_iconv_c,"$Id: w32_iconv.c,v 1.7 2021/10/19 14:11:34 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_iconv_c,"$Id: w32_iconv.c,v 1.8 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -10,18 +10,23 @@ __CIDENT_RCSID(gr_w32_iconv_c,"$Id: w32_iconv.c,v 1.7 2021/10/19 14:11:34 cvsuse * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. + * + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== */ diff --git a/mcwin32/libw32/w32_ino.c b/mcwin32/libw32/w32_ino.c index 7437253b..c370bf42 100644 --- a/mcwin32/libw32/w32_ino.c +++ b/mcwin32/libw32/w32_ino.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_ino_c,"$Id: w32_ino.c,v 1.11 2022/02/17 16:04:59 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_ino_c,"$Id: w32_ino.c,v 1.12 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -13,6 +13,7 @@ __CIDENT_RCSID(gr_w32_ino_c,"$Id: w32_ino.c,v 1.11 2022/02/17 16:04:59 cvsuser E * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_io.c b/mcwin32/libw32/w32_io.c index c130464e..9c4a15ad 100644 --- a/mcwin32/libw32/w32_io.c +++ b/mcwin32/libw32/w32_io.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_io_c, "$Id: w32_io.c,v 1.24 2022/02/17 16:04:59 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_io_c, "$Id: w32_io.c,v 1.25 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -11,18 +11,23 @@ __CIDENT_RCSID(gr_w32_io_c, "$Id: w32_io.c,v 1.24 2022/02/17 16:04:59 cvsuser Ex * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. + * + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== * * Notice: Portions of this text are reprinted and reproduced in electronic form. from diff --git a/mcwin32/libw32/w32_itimer.c b/mcwin32/libw32/w32_itimer.c index f2653e63..9787a450 100644 --- a/mcwin32/libw32/w32_itimer.c +++ b/mcwin32/libw32/w32_itimer.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_itimer_c,"$Id: w32_itimer.c,v 1.3 2022/02/17 16:04:59 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_itimer_c,"$Id: w32_itimer.c,v 1.4 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -10,24 +10,23 @@ __CIDENT_RCSID(gr_w32_itimer_c,"$Id: w32_itimer.c,v 1.3 2022/02/17 16:04:59 cvsu * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * Notice: Portions of this text are reprinted and reproduced in electronic form. from - * IEEE Portable Operating System Interface (POSIX), for reference only. Copyright (C) - * 2001-2003 by the Institute of. Electrical and Electronics Engineers, Inc and The Open - * Group. Copyright remains with the authors and the original Standard can be obtained - * online at http://www.opengroup.org/unix/online.html. + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== * * Notice: Portions of this text are reprinted and reproduced in electronic form. from diff --git a/mcwin32/libw32/w32_langinfo.c b/mcwin32/libw32/w32_langinfo.c index bef466d3..e7c3f4af 100644 --- a/mcwin32/libw32/w32_langinfo.c +++ b/mcwin32/libw32/w32_langinfo.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_langinfo_c,"$Id: w32_langinfo.c,v 1.8 2022/02/17 16:04:59 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_langinfo_c,"$Id: w32_langinfo.c,v 1.9 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -9,24 +9,23 @@ __CIDENT_RCSID(gr_w32_langinfo_c,"$Id: w32_langinfo.c,v 1.8 2022/02/17 16:04:59 * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * Notice: Portions of this text are reprinted and reproduced in electronic form. from - * IEEE Portable Operating System Interface (POSIX), for reference only. Copyright (C) - * 2001-2003 by the Institute of. Electrical and Electronics Engineers, Inc and The Open - * Group. Copyright remains with the authors and the original Standard can be obtained - * online at http://www.opengroup.org/unix/online.html. + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== */ diff --git a/mcwin32/libw32/w32_link.c b/mcwin32/libw32/w32_link.c index 3d1fbf71..40778aad 100644 --- a/mcwin32/libw32/w32_link.c +++ b/mcwin32/libw32/w32_link.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_link_c, "$Id: w32_link.c,v 1.10 2022/02/17 16:04:59 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_link_c, "$Id: w32_link.c,v 1.11 2022/03/16 13:46:59 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -13,6 +13,7 @@ __CIDENT_RCSID(gr_w32_link_c, "$Id: w32_link.c,v 1.10 2022/02/17 16:04:59 cvsuse * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_mknod.c b/mcwin32/libw32/w32_mknod.c index 8027c8b3..bd7f9e2c 100644 --- a/mcwin32/libw32/w32_mknod.c +++ b/mcwin32/libw32/w32_mknod.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_mknod_c,"$Id: w32_mknod.c,v 1.10 2022/02/17 16:04:59 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_mknod_c,"$Id: w32_mknod.c,v 1.11 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -9,24 +9,23 @@ __CIDENT_RCSID(gr_w32_mknod_c,"$Id: w32_mknod.c,v 1.10 2022/02/17 16:04:59 cvsus * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * Notice: Portions of this text are reprinted and reproduced in electronic form. from - * IEEE Portable Operating System Interface (POSIX), for reference only. Copyright (C) - * 2001-2003 by the Institute of. Electrical and Electronics Engineers, Inc and The Open - * Group. Copyright remains with the authors and the original Standard can be obtained - * online at http://www.opengroup.org/unix/online.html. + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== */ diff --git a/mcwin32/libw32/w32_mkstemp.c b/mcwin32/libw32/w32_mkstemp.c index d7dd8ee4..2ecea8af 100644 --- a/mcwin32/libw32/w32_mkstemp.c +++ b/mcwin32/libw32/w32_mkstemp.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_mkstemp_c, "$Id: w32_mkstemp.c,v 1.11 2022/02/17 16:04:59 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_mkstemp_c, "$Id: w32_mkstemp.c,v 1.12 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -9,18 +9,23 @@ __CIDENT_RCSID(gr_w32_mkstemp_c, "$Id: w32_mkstemp.c,v 1.11 2022/02/17 16:04:59 * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. + * + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== * * Notice: Portions of this text are reprinted and reproduced in electronic form. from diff --git a/mcwin32/libw32/w32_mmap.c b/mcwin32/libw32/w32_mmap.c index 7d805f47..99186ad0 100644 --- a/mcwin32/libw32/w32_mmap.c +++ b/mcwin32/libw32/w32_mmap.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_mmap_c,"$Id: w32_mmap.c,v 1.10 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_mmap_c,"$Id: w32_mmap.c,v 1.11 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -9,25 +9,31 @@ __CIDENT_RCSID(gr_w32_mmap_c,"$Id: w32_mmap.c,v 1.10 2022/02/17 16:05:00 cvsuser * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. + * + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. + * ==end== * * Notice: Portions of this text are reprinted and reproduced in electronic form. from * IEEE Portable Operating System Interface (POSIX), for reference only. Copyright (C) * 2001-2003 by the Institute of. Electrical and Electronics Engineers, Inc and The Open * Group. Copyright remains with the authors and the original Standard can be obtained * online at http://www.opengroup.org/unix/online.html. - * ==end== + * ==extra== */ #include "win32_internal.h" diff --git a/mcwin32/libw32/w32_neterr.c b/mcwin32/libw32/w32_neterr.c index aeb21a5e..4fc7877b 100644 --- a/mcwin32/libw32/w32_neterr.c +++ b/mcwin32/libw32/w32_neterr.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_neterr_c,"$Id: w32_neterr.c,v 1.7 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_neterr_c,"$Id: w32_neterr.c,v 1.8 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -9,18 +9,23 @@ __CIDENT_RCSID(gr_w32_neterr_c,"$Id: w32_neterr.c,v 1.7 2022/02/17 16:05:00 cvsu * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. + * + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== * * Notice: Portions of this text are reprinted and reproduced in electronic form. from @@ -28,7 +33,7 @@ __CIDENT_RCSID(gr_w32_neterr_c,"$Id: w32_neterr.c,v 1.7 2022/02/17 16:05:00 cvsu * 2001-2003 by the Institute of. Electrical and Electronics Engineers, Inc and The Open * Group. Copyright remains with the authors and the original Standard can be obtained * online at http://www.opengroup.org/unix/online.html. - * ==end== + * ==extra== */ #include "win32_internal.h" diff --git a/mcwin32/libw32/w32_poll.c b/mcwin32/libw32/w32_poll.c index d6300e12..4f1aee92 100644 --- a/mcwin32/libw32/w32_poll.c +++ b/mcwin32/libw32/w32_poll.c @@ -1,27 +1,31 @@ #include -__CIDENT_RCSID(gr_w32_poll_c,"$Id: w32_poll.c,v 1.6 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_poll_c,"$Id: w32_poll.c,v 1.7 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* * win32 poll system calls * - * Copyright (c) 1998 - 2022, Adam Young. - * + * Copyright (c) 1998 - 2022 Adam Young. * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. + * + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== * * Notice: Portions of this text are reprinted and reproduced in electronic form. from diff --git a/mcwin32/libw32/w32_popen.c b/mcwin32/libw32/w32_popen.c index f3de6d4a..39424243 100644 --- a/mcwin32/libw32/w32_popen.c +++ b/mcwin32/libw32/w32_popen.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_popen_c,"$Id: w32_popen.c,v 1.9 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_popen_c,"$Id: w32_popen.c,v 1.10 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -9,18 +9,23 @@ __CIDENT_RCSID(gr_w32_popen_c,"$Id: w32_popen.c,v 1.9 2022/02/17 16:05:00 cvsuse * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. + * + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== * * Notice: Portions of this text are reprinted and reproduced in electronic form. from diff --git a/mcwin32/libw32/w32_progname.c b/mcwin32/libw32/w32_progname.c index 7ab86315..6a173155 100644 --- a/mcwin32/libw32/w32_progname.c +++ b/mcwin32/libw32/w32_progname.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_progname_c,"$Id: w32_progname.c,v 1.8 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_progname_c,"$Id: w32_progname.c,v 1.9 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -10,25 +10,31 @@ __CIDENT_RCSID(gr_w32_progname_c,"$Id: w32_progname.c,v 1.8 2022/02/17 16:05:00 * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. + * + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. + * ==end== * * Notice: Portions of this text are reprinted and reproduced in electronic form. from * IEEE Portable Operating System Interface (POSIX), for reference only. Copyright (C) * 2001-2003 by the Institute of. Electrical and Electronics Engineers, Inc and The Open * Group. Copyright remains with the authors and the original Standard can be obtained * online at http://www.opengroup.org/unix/online.html. - * ==end== + * ==extra== */ #include "win32_internal.h" diff --git a/mcwin32/libw32/w32_pwd.c b/mcwin32/libw32/w32_pwd.c index 7597d4e7..4f021508 100644 --- a/mcwin32/libw32/w32_pwd.c +++ b/mcwin32/libw32/w32_pwd.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_pwd_c,"$Id: w32_pwd.c,v 1.12 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_pwd_c,"$Id: w32_pwd.c,v 1.13 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -9,25 +9,31 @@ __CIDENT_RCSID(gr_w32_pwd_c,"$Id: w32_pwd.c,v 1.12 2022/02/17 16:05:00 cvsuser E * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. + * + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. + * ==end== * * Notice: Portions of this text are reprinted and reproduced in electronic form. from * IEEE Portable Operating System Interface (POSIX), for reference only. Copyright (C) * 2001-2003 by the Institute of. Electrical and Electronics Engineers, Inc and The Open * Group. Copyright remains with the authors and the original Standard can be obtained * online at http://www.opengroup.org/unix/online.html. - * ==end== + * ==extra== */ #if !defined(_WIN32_WINNT) diff --git a/mcwin32/libw32/w32_read.c b/mcwin32/libw32/w32_read.c index 0c2ade4f..8f2ca4b3 100644 --- a/mcwin32/libw32/w32_read.c +++ b/mcwin32/libw32/w32_read.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_read_c,"$Id: w32_read.c,v 1.9 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_read_c,"$Id: w32_read.c,v 1.10 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -9,25 +9,31 @@ __CIDENT_RCSID(gr_w32_read_c,"$Id: w32_read.c,v 1.9 2022/02/17 16:05:00 cvsuser * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. + * + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. + * ==end== * * Notice: Portions of this text are reprinted and reproduced in electronic form. from * IEEE Portable Operating System Interface (POSIX), for reference only. Copyright (C) * 2001-2003 by the Institute of. Electrical and Electronics Engineers, Inc and The Open * Group. Copyright remains with the authors and the original Standard can be obtained * online at http://www.opengroup.org/unix/online.html. - * ==end== + * ==extra== */ #ifndef _WIN32_WINNT diff --git a/mcwin32/libw32/w32_readv.c b/mcwin32/libw32/w32_readv.c index 68ff9913..6ee4c42c 100644 --- a/mcwin32/libw32/w32_readv.c +++ b/mcwin32/libw32/w32_readv.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_readv_c,"$Id: w32_readv.c,v 1.3 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_readv_c,"$Id: w32_readv.c,v 1.4 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -10,18 +10,23 @@ __CIDENT_RCSID(gr_w32_readv_c,"$Id: w32_readv.c,v 1.3 2022/02/17 16:05:00 cvsuse * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. + * + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== * * Notice: Portions of this text are reprinted and reproduced in electronic form. from diff --git a/mcwin32/libw32/w32_realpath.c b/mcwin32/libw32/w32_realpath.c index 0449cf8d..65104e96 100644 --- a/mcwin32/libw32/w32_realpath.c +++ b/mcwin32/libw32/w32_realpath.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_realpath_c, "$Id: w32_realpath.c,v 1.10 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_realpath_c, "$Id: w32_realpath.c,v 1.11 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -7,28 +7,25 @@ __CIDENT_RCSID(gr_w32_realpath_c, "$Id: w32_realpath.c,v 1.10 2022/02/17 16:05:0 * * realpath * - * Copyright (c) 2018 - 2022 Adam Young. - * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * Notice: Portions of this text are reprinted and reproduced in electronic form. from - * IEEE Portable Operating System Interface (POSIX), for reference only. Copyright (C) - * 2001-2003 by the Institute of. Electrical and Electronics Engineers, Inc and The Open - * Group. Copyright remains with the authors and the original Standard can be obtained - * online at http://www.opengroup.org/unix/online.html. + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== */ diff --git a/mcwin32/libw32/w32_rename.c b/mcwin32/libw32/w32_rename.c index 31afde33..bf7dcfc7 100644 --- a/mcwin32/libw32/w32_rename.c +++ b/mcwin32/libw32/w32_rename.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_rename_c,"$Id: w32_rename.c,v 1.4 2021/05/24 15:10:34 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_rename_c,"$Id: w32_rename.c,v 1.5 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -13,6 +13,7 @@ __CIDENT_RCSID(gr_w32_rename_c,"$Id: w32_rename.c,v 1.4 2021/05/24 15:10:34 cvsu * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_reparse.c b/mcwin32/libw32/w32_reparse.c index 4c3ccacf..8192e66e 100644 --- a/mcwin32/libw32/w32_reparse.c +++ b/mcwin32/libw32/w32_reparse.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_reparse_c,"$Id: w32_reparse.c,v 1.12 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_reparse_c,"$Id: w32_reparse.c,v 1.13 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -9,24 +9,23 @@ __CIDENT_RCSID(gr_w32_reparse_c,"$Id: w32_reparse.c,v 1.12 2022/02/17 16:05:00 c * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * Notice: Portions of this text are reprinted and reproduced in electronic form. from - * IEEE Portable Operating System Interface (POSIX), for reference only. Copyright (C) - * 2001-2003 by the Institute of. Electrical and Electronics Engineers, Inc and The Open - * Group. Copyright remains with the authors and the original Standard can be obtained - * online at http://www.opengroup.org/unix/online.html. + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== * * Sourced originally from a public domain implementation and highly. diff --git a/mcwin32/libw32/w32_rwlock.c b/mcwin32/libw32/w32_rwlock.c index 3c998722..0bf48524 100644 --- a/mcwin32/libw32/w32_rwlock.c +++ b/mcwin32/libw32/w32_rwlock.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_rwlock_c,"$Id: w32_rwlock.c,v 1.3 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_rwlock_c,"$Id: w32_rwlock.c,v 1.4 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -10,24 +10,23 @@ __CIDENT_RCSID(gr_w32_rwlock_c,"$Id: w32_rwlock.c,v 1.3 2022/02/17 16:05:00 cvsu * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * Notice: Portions of this text are reprinted and reproduced in electronic form. from - * IEEE Portable Operating System Interface (POSIX), for reference only. Copyright (C) - * 2001-2003 by the Institute of. Electrical and Electronics Engineers, Inc and The Open - * Group. Copyright remains with the authors and the original Standard can be obtained - * online at http://www.opengroup.org/unix/online.html. + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== * * Notice: Portions of this text are reprinted and reproduced in electronic form. from diff --git a/mcwin32/libw32/w32_select.c b/mcwin32/libw32/w32_select.c index 7d34bcf7..dbc1af63 100644 --- a/mcwin32/libw32/w32_select.c +++ b/mcwin32/libw32/w32_select.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_select_c,"$Id: w32_select.c,v 1.8 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_select_c,"$Id: w32_select.c,v 1.9 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -9,24 +9,23 @@ __CIDENT_RCSID(gr_w32_select_c,"$Id: w32_select.c,v 1.8 2022/02/17 16:05:00 cvsu * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * Notice: Portions of this text are reprinted and reproduced in electronic form. from - * IEEE Portable Operating System Interface (POSIX), for reference only. Copyright (C) - * 2001-2003 by the Institute of. Electrical and Electronics Engineers, Inc and The Open - * Group. Copyright remains with the authors and the original Standard can be obtained - * online at http://www.opengroup.org/unix/online.html. + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== */ diff --git a/mcwin32/libw32/w32_shell.c b/mcwin32/libw32/w32_shell.c index daba461c..f2f60eb1 100644 --- a/mcwin32/libw32/w32_shell.c +++ b/mcwin32/libw32/w32_shell.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_shell_c,"$Id: w32_shell.c,v 1.13 2022/02/19 14:52:09 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_shell_c,"$Id: w32_shell.c,v 1.14 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -9,25 +9,31 @@ __CIDENT_RCSID(gr_w32_shell_c,"$Id: w32_shell.c,v 1.13 2022/02/19 14:52:09 cvsus * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. + * + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. + * ==end== * * Notice: Portions of this text are reprinted and reproduced in electronic form. from * IEEE Portable Operating System Interface (POSIX), for reference only. Copyright (C) * 2001-2003 by the Institute of. Electrical and Electronics Engineers, Inc and The Open * Group. Copyright remains with the authors and the original Standard can be obtained * online at http://www.opengroup.org/unix/online.html. - * ==end== + * ==extra== */ #include "win32_internal.h" diff --git a/mcwin32/libw32/w32_signal.c b/mcwin32/libw32/w32_signal.c index 819b7495..8d7b669b 100644 --- a/mcwin32/libw32/w32_signal.c +++ b/mcwin32/libw32/w32_signal.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_signal_c,"$Id: w32_signal.c,v 1.7 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_signal_c,"$Id: w32_signal.c,v 1.8 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -9,24 +9,23 @@ __CIDENT_RCSID(gr_w32_signal_c,"$Id: w32_signal.c,v 1.7 2022/02/17 16:05:00 cvsu * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * Notice: Portions of this text are reprinted and reproduced in electronic form. from - * IEEE Portable Operating System Interface (POSIX), for reference only. Copyright (C) - * 2001-2003 by the Institute of. Electrical and Electronics Engineers, Inc and The Open - * Group. Copyright remains with the authors and the original Standard can be obtained - * online at http://www.opengroup.org/unix/online.html. + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== */ diff --git a/mcwin32/libw32/w32_slang.c b/mcwin32/libw32/w32_slang.c index 8563be4d..5039baa0 100644 --- a/mcwin32/libw32/w32_slang.c +++ b/mcwin32/libw32/w32_slang.c @@ -6,24 +6,23 @@ * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * Notice: Portions of this text are reprinted and reproduced in electronic form. from - * IEEE Portable Operating System Interface (POSIX), for reference only. Copyright (C) - * 2001-2003 by the Institute of. Electrical and Electronics Engineers, Inc and The Open - * Group. Copyright remains with the authors and the original Standard can be obtained - * online at http://www.opengroup.org/unix/online.html. + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== */ diff --git a/mcwin32/libw32/w32_sockbase.c b/mcwin32/libw32/w32_sockbase.c index cf61778d..ad0b6284 100644 --- a/mcwin32/libw32/w32_sockbase.c +++ b/mcwin32/libw32/w32_sockbase.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_sockbase_c,"$Id: w32_sockbase.c,v 1.6 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_sockbase_c,"$Id: w32_sockbase.c,v 1.7 2022/03/16 13:47:00 cvsuser Exp $") /* * win32 socket () system calls @@ -12,6 +12,7 @@ __CIDENT_RCSID(gr_w32_sockbase_c,"$Id: w32_sockbase.c,v 1.6 2022/02/17 16:05:00 * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_socket.c b/mcwin32/libw32/w32_socket.c index 83c68664..c4062aab 100644 --- a/mcwin32/libw32/w32_socket.c +++ b/mcwin32/libw32/w32_socket.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_socket_c,"$Id: w32_socket.c,v 1.12 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_socket_c,"$Id: w32_socket.c,v 1.13 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -13,6 +13,7 @@ __CIDENT_RCSID(gr_w32_socket_c,"$Id: w32_socket.c,v 1.12 2022/02/17 16:05:00 cvs * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_socket2.c b/mcwin32/libw32/w32_socket2.c index 53e766b7..26c0a1fb 100644 --- a/mcwin32/libw32/w32_socket2.c +++ b/mcwin32/libw32/w32_socket2.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_socket2_c,"$Id: w32_socket2.c,v 1.9 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_socket2_c,"$Id: w32_socket2.c,v 1.10 2022/03/16 13:47:00 cvsuser Exp $") /* * win32 socket () system calls @@ -12,6 +12,7 @@ __CIDENT_RCSID(gr_w32_socket2_c,"$Id: w32_socket2.c,v 1.9 2022/02/17 16:05:00 cv * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_sockfd.c b/mcwin32/libw32/w32_sockfd.c index 45c69954..5c21a00a 100644 --- a/mcwin32/libw32/w32_sockfd.c +++ b/mcwin32/libw32/w32_sockfd.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_sockfd_c,"$Id: w32_sockfd.c,v 1.8 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_sockfd_c,"$Id: w32_sockfd.c,v 1.9 2022/03/16 13:47:00 cvsuser Exp $") /* * win32 socket file-descriptor support @@ -11,6 +11,7 @@ __CIDENT_RCSID(gr_w32_sockfd_c,"$Id: w32_sockfd.c,v 1.8 2022/02/17 16:05:00 cvsu * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_sockpair.c b/mcwin32/libw32/w32_sockpair.c index 44cddb34..79511000 100644 --- a/mcwin32/libw32/w32_sockpair.c +++ b/mcwin32/libw32/w32_sockpair.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_sockpair_c,"$Id: w32_sockpair.c,v 1.7 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_sockpair_c,"$Id: w32_sockpair.c,v 1.8 2022/03/16 13:47:00 cvsuser Exp $") /* * win32 socket file-descriptor support @@ -8,18 +8,23 @@ __CIDENT_RCSID(gr_w32_sockpair_c,"$Id: w32_sockpair.c,v 1.7 2022/02/17 16:05:00 * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. + * + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== * * Notice: Portions of this text are reprinted and reproduced in electronic form. from diff --git a/mcwin32/libw32/w32_statfs.c b/mcwin32/libw32/w32_statfs.c index adbcd151..1bd92f77 100644 --- a/mcwin32/libw32/w32_statfs.c +++ b/mcwin32/libw32/w32_statfs.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_statfs_c,"$Id: w32_statfs.c,v 1.10 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_statfs_c,"$Id: w32_statfs.c,v 1.11 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -9,18 +9,23 @@ __CIDENT_RCSID(gr_w32_statfs_c,"$Id: w32_statfs.c,v 1.10 2022/02/17 16:05:00 cvs * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. + * + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== * * Notice: Portions of this text are reprinted and reproduced in electronic form. from diff --git a/mcwin32/libw32/w32_strftime.c b/mcwin32/libw32/w32_strftime.c index 95fe003d..1050f591 100644 --- a/mcwin32/libw32/w32_strftime.c +++ b/mcwin32/libw32/w32_strftime.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_strftime_c,"$Id: w32_strftime.c,v 1.5 2018/10/12 00:52:04 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_strftime_c,"$Id: w32_strftime.c,v 1.6 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* diff --git a/mcwin32/libw32/w32_string.c b/mcwin32/libw32/w32_string.c index 760e1c35..fe30dfa3 100644 --- a/mcwin32/libw32/w32_string.c +++ b/mcwin32/libw32/w32_string.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_string_c,"$Id: w32_string.c,v 1.7 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_string_c,"$Id: w32_string.c,v 1.8 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -9,24 +9,23 @@ __CIDENT_RCSID(gr_w32_string_c,"$Id: w32_string.c,v 1.7 2022/02/17 16:05:00 cvsu * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * Notice: Portions of this text are reprinted and reproduced in electronic form. from - * IEEE Portable Operating System Interface (POSIX), for reference only. Copyright (C) - * 2001-2003 by the Institute of. Electrical and Electronics Engineers, Inc and The Open - * Group. Copyright remains with the authors and the original Standard can be obtained - * online at http://www.opengroup.org/unix/online.html. + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== */ diff --git a/mcwin32/libw32/w32_strlcat.c b/mcwin32/libw32/w32_strlcat.c index 44a32903..dc579f92 100644 --- a/mcwin32/libw32/w32_strlcat.c +++ b/mcwin32/libw32/w32_strlcat.c @@ -1,29 +1,27 @@ #include -__CIDENT_RCSID(gr_w32_strlcat_c,"$Id: w32_strlcat.c,v 1.8 2021/11/30 13:06:20 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_strlcat_c,"$Id: w32_strlcat.c,v 1.9 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* - * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * Notice: Portions of this text are reprinted and reproduced in electronic form. from - * IEEE Portable Operating System Interface (POSIX), for reference only. Copyright (C) - * 2001-2003 by the Institute of. Electrical and Electronics Engineers, Inc and The Open - * Group. Copyright remains with the authors and the original Standard can be obtained - * online at http://www.opengroup.org/unix/online.html. + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== * * Notice: Portions of this text are reprinted and reproduced in electronic form. from diff --git a/mcwin32/libw32/w32_strlcpy.c b/mcwin32/libw32/w32_strlcpy.c index 791f6161..470c4bb6 100644 --- a/mcwin32/libw32/w32_strlcpy.c +++ b/mcwin32/libw32/w32_strlcpy.c @@ -1,30 +1,27 @@ #include -__CIDENT_RCSID(gr_w32_strlcpy_c,"$Id: w32_strlcpy.c,v 1.7 2018/10/12 00:52:04 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_strlcpy_c,"$Id: w32_strlcpy.c,v 1.8 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* -* * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * ==end== + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * Notice: Portions of this text are reprinted and reproduced in electronic form. from - * IEEE Portable Operating System Interface (POSIX), for reference only. Copyright (C) - * 2001-2003 by the Institute of. Electrical and Electronics Engineers, Inc and The Open - * Group. Copyright remains with the authors and the original Standard can be obtained - * online at http://www.opengroup.org/unix/online.html. + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==extra== * * Copyright (c) 1998 Todd C. Miller diff --git a/mcwin32/libw32/w32_strtoll.c b/mcwin32/libw32/w32_strtoll.c index 7d6e5490..df2474f5 100644 --- a/mcwin32/libw32/w32_strtoll.c +++ b/mcwin32/libw32/w32_strtoll.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_strtoll_c,"$Id: w32_strtoll.c,v 1.6 2018/10/12 00:52:04 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_strtoll_c,"$Id: w32_strtoll.c,v 1.7 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /*- diff --git a/mcwin32/libw32/w32_strtoull.c b/mcwin32/libw32/w32_strtoull.c index 5c1db288..93c9bf58 100644 --- a/mcwin32/libw32/w32_strtoull.c +++ b/mcwin32/libw32/w32_strtoull.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_strtoull_c,"$Id: w32_strtoull.c,v 1.6 2018/10/12 00:52:04 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_strtoull_c,"$Id: w32_strtoull.c,v 1.7 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /*- diff --git a/mcwin32/libw32/w32_sysdir.c b/mcwin32/libw32/w32_sysdir.c index 509e26d5..2837a60e 100644 --- a/mcwin32/libw32/w32_sysdir.c +++ b/mcwin32/libw32/w32_sysdir.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_sysdir_c,"$Id: w32_sysdir.c,v 1.9 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_sysdir_c,"$Id: w32_sysdir.c,v 1.10 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -9,24 +9,23 @@ __CIDENT_RCSID(gr_w32_sysdir_c,"$Id: w32_sysdir.c,v 1.9 2022/02/17 16:05:00 cvsu * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * Notice: Portions of this text are reprinted and reproduced in electronic form. from - * IEEE Portable Operating System Interface (POSIX), for reference only. Copyright (C) - * 2001-2003 by the Institute of. Electrical and Electronics Engineers, Inc and The Open - * Group. Copyright remains with the authors and the original Standard can be obtained - * online at http://www.opengroup.org/unix/online.html. + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== */ diff --git a/mcwin32/libw32/w32_time.c b/mcwin32/libw32/w32_time.c index 1d79c8e8..6231d446 100644 --- a/mcwin32/libw32/w32_time.c +++ b/mcwin32/libw32/w32_time.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_time_c,"$Id: w32_time.c,v 1.10 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_time_c,"$Id: w32_time.c,v 1.11 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -13,6 +13,7 @@ __CIDENT_RCSID(gr_w32_time_c,"$Id: w32_time.c,v 1.10 2022/02/17 16:05:00 cvsuser * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_truncate.c b/mcwin32/libw32/w32_truncate.c index 1ba3dbae..919e4223 100644 --- a/mcwin32/libw32/w32_truncate.c +++ b/mcwin32/libw32/w32_truncate.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_truncate_c,"$Id: w32_truncate.c,v 1.9 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_truncate_c,"$Id: w32_truncate.c,v 1.10 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -13,6 +13,7 @@ __CIDENT_RCSID(gr_w32_truncate_c,"$Id: w32_truncate.c,v 1.9 2022/02/17 16:05:00 * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_uname.c b/mcwin32/libw32/w32_uname.c index b506ba56..5a5e61a9 100644 --- a/mcwin32/libw32/w32_uname.c +++ b/mcwin32/libw32/w32_uname.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_uname_c,"$Id: w32_uname.c,v 1.6 2021/06/10 12:42:34 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_uname_c,"$Id: w32_uname.c,v 1.7 2022/03/16 13:47:00 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -9,24 +9,23 @@ __CIDENT_RCSID(gr_w32_uname_c,"$Id: w32_uname.c,v 1.6 2021/06/10 12:42:34 cvsuse * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * Notice: Portions of this text are reprinted and reproduced in electronic form. from - * IEEE Portable Operating System Interface (POSIX), for reference only. Copyright (C) - * 2001-2003 by the Institute of. Electrical and Electronics Engineers, Inc and The Open - * Group. Copyright remains with the authors and the original Standard can be obtained - * online at http://www.opengroup.org/unix/online.html. + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== */ diff --git a/mcwin32/libw32/w32_unlink.c b/mcwin32/libw32/w32_unlink.c index dfe02075..c75a6051 100644 --- a/mcwin32/libw32/w32_unlink.c +++ b/mcwin32/libw32/w32_unlink.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_unlink_c,"$Id: w32_unlink.c,v 1.11 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_unlink_c,"$Id: w32_unlink.c,v 1.12 2022/03/16 13:47:01 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -13,6 +13,7 @@ __CIDENT_RCSID(gr_w32_unlink_c,"$Id: w32_unlink.c,v 1.11 2022/02/17 16:05:00 cvs * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_user.c b/mcwin32/libw32/w32_user.c index 27a299a3..0b80b3ca 100644 --- a/mcwin32/libw32/w32_user.c +++ b/mcwin32/libw32/w32_user.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_user_c,"$Id: w32_user.c,v 1.15 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_user_c,"$Id: w32_user.c,v 1.16 2022/03/16 13:47:01 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -13,6 +13,7 @@ __CIDENT_RCSID(gr_w32_user_c,"$Id: w32_user.c,v 1.15 2022/02/17 16:05:00 cvsuser * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_util.c b/mcwin32/libw32/w32_util.c index e40c1e97..c99726e3 100644 --- a/mcwin32/libw32/w32_util.c +++ b/mcwin32/libw32/w32_util.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_util_c,"$Id: w32_util.c,v 1.14 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_util_c,"$Id: w32_util.c,v 1.15 2022/03/16 13:47:01 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -13,6 +13,7 @@ __CIDENT_RCSID(gr_w32_util_c,"$Id: w32_util.c,v 1.14 2022/02/17 16:05:00 cvsuser * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_wdirent.c b/mcwin32/libw32/w32_wdirent.c index b15c2e90..60b48d37 100644 --- a/mcwin32/libw32/w32_wdirent.c +++ b/mcwin32/libw32/w32_wdirent.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_wdirent_c,"$Id: w32_wdirent.c,v 1.3 2021/12/19 16:31:14 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_wdirent_c,"$Id: w32_wdirent.c,v 1.4 2022/03/16 13:47:01 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -7,13 +7,14 @@ __CIDENT_RCSID(gr_w32_wdirent_c,"$Id: w32_wdirent.c,v 1.3 2021/12/19 16:31:14 cv * * _wopendir, _wclosedir, _wreaddir, _wseekdir, _wrewindir, _wtelldir * - * Copyright (c) 2021 Adam Young. + * Copyright (c) 2021 - 2022 Adam Young. * * This file is part of the Midnight Commander. * * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/w32_write.c b/mcwin32/libw32/w32_write.c index 36cb9943..c28bf908 100644 --- a/mcwin32/libw32/w32_write.c +++ b/mcwin32/libw32/w32_write.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_write_c,"$Id: w32_write.c,v 1.11 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_write_c,"$Id: w32_write.c,v 1.12 2022/03/16 13:47:01 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -9,24 +9,23 @@ __CIDENT_RCSID(gr_w32_write_c,"$Id: w32_write.c,v 1.11 2022/02/17 16:05:00 cvsus * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * Notice: Portions of this text are reprinted and reproduced in electronic form. from - * IEEE Portable Operating System Interface (POSIX), for reference only. Copyright (C) - * 2001-2003 by the Institute of. Electrical and Electronics Engineers, Inc and The Open - * Group. Copyright remains with the authors and the original Standard can be obtained - * online at http://www.opengroup.org/unix/online.html. + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== */ diff --git a/mcwin32/libw32/w32_writev.c b/mcwin32/libw32/w32_writev.c index 55296e74..8aa75ae1 100644 --- a/mcwin32/libw32/w32_writev.c +++ b/mcwin32/libw32/w32_writev.c @@ -1,5 +1,5 @@ #include -__CIDENT_RCSID(gr_w32_writev_c,"$Id: w32_writev.c,v 1.3 2022/02/17 16:05:00 cvsuser Exp $") +__CIDENT_RCSID(gr_w32_writev_c,"$Id: w32_writev.c,v 1.4 2022/03/16 13:47:01 cvsuser Exp $") /* -*- mode: c; indent-width: 4; -*- */ /* @@ -10,26 +10,24 @@ __CIDENT_RCSID(gr_w32_writev_c,"$Id: w32_writev.c,v 1.3 2022/02/17 16:05:00 cvsu * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * ==end== + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * Notice: Portions of this text are reprinted and reproduced in electronic form. from - * IEEE Portable Operating System Interface (POSIX), for reference only. Copyright (C) - * 2001-2003 by the Institute of. Electrical and Electronics Engineers, Inc and The Open - * Group. Copyright remains with the authors and the original Standard can be obtained - * online at http://www.opengroup.org/unix/online.html. - * ==extra== + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. + * ==end== */ #ifndef _WIN32_WINNT diff --git a/mcwin32/libw32/w32config.hin b/mcwin32/libw32/w32config.hin index 2009644d..bf407896 100644 --- a/mcwin32/libw32/w32config.hin +++ b/mcwin32/libw32/w32config.hin @@ -1,7 +1,7 @@ #ifndef WIN32_CONFIG_H_INCLUDED #define WIN32_CONFIG_H_INCLUDED /* -*- mode: c; set-indent: 4; -*- */ -/* $Id: w32config.hin,v 1.16 2021/10/19 14:12:05 cvsuser Exp $ +/* $Id: w32config.hin,v 1.17 2022/03/16 13:47:01 cvsuser Exp $ * Machine configuration. * * System dependent configuration template, diff --git a/mcwin32/libw32/win32_cdef.h b/mcwin32/libw32/win32_cdef.h index 5ec92278..4e74b03d 100644 --- a/mcwin32/libw32/win32_cdef.h +++ b/mcwin32/libw32/win32_cdef.h @@ -11,6 +11,7 @@ * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/win32_child.h b/mcwin32/libw32/win32_child.h index 64adae6e..842bd643 100644 --- a/mcwin32/libw32/win32_child.h +++ b/mcwin32/libw32/win32_child.h @@ -1,7 +1,7 @@ #ifndef LIBW32_WIN32_CHILD_H_INCLUDED #define LIBW32_WIN32_CHILD_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_win32_child_h,"$Id: win32_child.h,v 1.11 2022/02/17 16:05:01 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_win32_child_h,"$Id: win32_child.h,v 1.12 2022/03/16 13:47:01 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ @@ -16,6 +16,7 @@ __CPRAGMA_ONCE * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/win32_direct.h b/mcwin32/libw32/win32_direct.h index ec8b01c0..709b6161 100644 --- a/mcwin32/libw32/win32_direct.h +++ b/mcwin32/libw32/win32_direct.h @@ -7,18 +7,23 @@ * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. + * + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== */ diff --git a/mcwin32/libw32/win32_errno.h b/mcwin32/libw32/win32_errno.h index 1549a90d..2457df53 100644 --- a/mcwin32/libw32/win32_errno.h +++ b/mcwin32/libw32/win32_errno.h @@ -1,7 +1,7 @@ #ifndef LIBW32_WIN32_ERRNO_H_INCLUDED #define LIBW32_WIN32_ERRNO_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_win32_errno_h,"$Id: win32_errno.h,v 1.7 2022/02/17 16:05:01 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_win32_errno_h,"$Id: win32_errno.h,v 1.8 2022/03/16 13:47:01 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ @@ -15,6 +15,7 @@ __CPRAGMA_ONCE * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/win32_iconv.h b/mcwin32/libw32/win32_iconv.h index d043df16..8b72930c 100644 --- a/mcwin32/libw32/win32_iconv.h +++ b/mcwin32/libw32/win32_iconv.h @@ -1,7 +1,7 @@ #ifndef LIBW32_WIN32_ICONV_H_INCLUDED #define LIBW32_WIN32_ICONV_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_win32_iconv_h,"$Id: win32_iconv.h,v 1.7 2022/02/17 16:05:01 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_win32_iconv_h,"$Id: win32_iconv.h,v 1.8 2022/03/16 13:47:01 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ @@ -11,21 +11,25 @@ __CPRAGMA_ONCE * Copyright (c) 2007, 2012 - 2022, Adam Young. * All rights reserved. * - * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * - * The Midnight Commander is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. + * + * This project is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license for more details. * ==end== */ diff --git a/mcwin32/libw32/win32_include.h b/mcwin32/libw32/win32_include.h index 4ced5339..56ab0874 100644 --- a/mcwin32/libw32/win32_include.h +++ b/mcwin32/libw32/win32_include.h @@ -1,7 +1,7 @@ #ifndef LIBW32_WIN32_INCLUDE_H_INCLUDED #define LIBW32_WIN32_INCLUDE_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_win32_include_h,"$Id: win32_include.h,v 1.7 2022/02/17 16:05:01 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_win32_include_h,"$Id: win32_include.h,v 1.8 2022/03/16 13:47:01 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ @@ -16,6 +16,7 @@ __CPRAGMA_ONCE * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/win32_internal.h b/mcwin32/libw32/win32_internal.h index 4d5313ec..226e50af 100644 --- a/mcwin32/libw32/win32_internal.h +++ b/mcwin32/libw32/win32_internal.h @@ -1,7 +1,7 @@ #ifndef LIBW32_WIN32_INTERNAL_H_INCLUDED #define LIBW32_WIN32_INTERNAL_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_win32_internal_h,"$Id: win32_internal.h,v 1.21 2022/02/17 16:05:01 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_win32_internal_h,"$Id: win32_internal.h,v 1.22 2022/03/16 13:47:01 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ @@ -16,6 +16,7 @@ __CPRAGMA_ONCE * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/win32_io.h b/mcwin32/libw32/win32_io.h index ee499ba7..2478c321 100644 --- a/mcwin32/libw32/win32_io.h +++ b/mcwin32/libw32/win32_io.h @@ -1,7 +1,7 @@ #ifndef LIBW32_WIN32_IO_H_INCLUDED #define LIBW32_WIN32_IO_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_win32_io_h,"$Id: win32_io.h,v 1.22 2022/02/24 16:39:23 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_win32_io_h,"$Id: win32_io.h,v 1.23 2022/03/16 13:47:01 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ @@ -13,19 +13,23 @@ __CPRAGMA_ONCE * * This file is part of the Midnight Commander. * - * The Midnight Commander is free software: you can redistribute it + * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the License, + * published by the Free Software Foundation, version 3. * or (at your option) any later version. * + * Redistributions of source code must retain the above copyright + * notice, and must be distributed with the license document above. + * + * Redistributions in binary form must reproduce the above copyright + * notice, and must include the license document above in + * the documentation and/or other materials provided with the + * distribution. * * This project is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * license for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . * ==end== */ diff --git a/mcwin32/libw32/win32_ioctl.h b/mcwin32/libw32/win32_ioctl.h index c55ab3cc..83a19ca7 100644 --- a/mcwin32/libw32/win32_ioctl.h +++ b/mcwin32/libw32/win32_ioctl.h @@ -1,14 +1,14 @@ #ifndef LIBW32_WIN32_IOCTL_H_INCLUDED #define LIBW32_WIN32_IOCTL_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_win32_ioctl_h,"$Id: win32_ioctl.h,v 1.3 2021/04/13 15:49:35 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_win32_ioctl_h,"$Id: win32_ioctl.h,v 1.4 2022/03/16 13:47:01 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ /* * win32 ioctl support. * - * Copyright (c) 2018, Adam Young. + * Copyright (c) 2018 - 2022, Adam Young. * All rights reserved. * * This file is part of the Midnight Commander. @@ -16,6 +16,7 @@ __CPRAGMA_ONCE * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/win32_misc.h b/mcwin32/libw32/win32_misc.h index b399a8b8..0ce10082 100644 --- a/mcwin32/libw32/win32_misc.h +++ b/mcwin32/libw32/win32_misc.h @@ -1,7 +1,7 @@ #ifndef LIBW32_WIN32_MISC_H_INCLUDED #define LIBW32_WIN32_MISC_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_win32_misc_h,"$Id: win32_misc.h,v 1.9 2022/02/17 16:05:01 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_win32_misc_h,"$Id: win32_misc.h,v 1.10 2022/03/16 13:47:01 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ @@ -16,6 +16,7 @@ __CPRAGMA_ONCE * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. diff --git a/mcwin32/libw32/win32_time.h b/mcwin32/libw32/win32_time.h index a35a4229..1d5ed3ad 100644 --- a/mcwin32/libw32/win32_time.h +++ b/mcwin32/libw32/win32_time.h @@ -1,7 +1,7 @@ #ifndef LIBW32_WIN32_TIME_H_INCLUDED #define LIBW32_WIN32_TIME_H_INCLUDED #include -__CIDENT_RCSID(gr_libw32_win32_time_h,"$Id: win32_time.h,v 1.11 2022/02/17 16:05:01 cvsuser Exp $") +__CIDENT_RCSID(gr_libw32_win32_time_h,"$Id: win32_time.h,v 1.12 2022/03/16 13:47:01 cvsuser Exp $") __CPRAGMA_ONCE /* -*- mode: c; indent-width: 4; -*- */ @@ -16,6 +16,7 @@ __CPRAGMA_ONCE * The applications are free software: you can redistribute it * and/or modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, version 3. + * or (at your option) any later version. * * Redistributions of source code must retain the above copyright * notice, and must be distributed with the license document above. From b01576c9bad5a265d6f4f3928858ecea7abcb4a1 Mon Sep 17 00:00:00 2001 From: adamyg Date: Wed, 16 Mar 2022 22:18:38 +0800 Subject: [PATCH 2/6] mcwin specialisation --- mcwin32/win32_plugin/extfs.d/uzip.in | 487 +++++++++++++++++++++++++++ 1 file changed, 487 insertions(+) create mode 100644 mcwin32/win32_plugin/extfs.d/uzip.in diff --git a/mcwin32/win32_plugin/extfs.d/uzip.in b/mcwin32/win32_plugin/extfs.d/uzip.in new file mode 100644 index 00000000..43bd9a65 --- /dev/null +++ b/mcwin32/win32_plugin/extfs.d/uzip.in @@ -0,0 +1,487 @@ +#! @PERL@ -w +# +# zip file archive Virtual File System for Midnight Commander +# Version 1.4.0 (2001-08-07). +# +# (C) 2000-2001 Oskar Liljeblad . +# Note: MCWIN32 branch specific. +# + +use POSIX; +use File::Basename; +use strict; + +# +# Configuration options +# + +# Location of the zip program +my $app_zip = "@ZIP@"; +# Location of the unzip program +my $app_unzip = $ENV{MC_TEST_EXTFS_LIST_CMD} || "@UNZIP@"; +# Set this to 1 if zipinfo (unzip -Z) is to be used (recommended), otherwise 0. +my $op_has_zipinfo = exists($ENV{MC_TEST_EXTFS_HAVE_ZIPINFO}) ? $ENV{MC_TEST_EXTFS_HAVE_ZIPINFO} : @HAVE_ZIPINFO@; + +# Command used to list archives (zipinfo mode) +my $cmd_list_zi = "$app_unzip -Z -l -T"; +# Command used to list archives (non-zipinfo mode) +my $cmd_list_nzi = "$app_unzip -qq -v"; +# Command used to add a file to the archive +my $cmd_add = "$app_zip -g"; +# Command used to add a link file to the archive (unused) +my $cmd_addlink = "$app_zip -g -y"; +# Command used to delete a file from the archive +my $cmd_delete = "$app_zip -d"; +# Command used to extract a file to standard out +my $cmd_extract = "$app_unzip -p"; + +# -rw-r--r-- 2.2 unx 2891 tx 1435 defN 20000330.211927 ./edit.html +# (perm) (?) (?) (size) (?) (zippedsize) (method) (yyyy)(mm)(dd).(HH)(MM)(SS) (fname) +my $regex_zipinfo_line = qr"^(\S{7,10})\s+(\d+\.\d+)\s+(\S+)\s+(\d+)\s+(\S\S)\s+(\d+)\s+(\S{4})\s+(\d{4})(\d\d)(\d\d)\.(\d\d)(\d\d)(\d\d)\s(.*)$"; + +# 2891 Defl:N 1435 50% 03-30-00 21:19 50cbaaf8 ./edit.html +# (size) (method) (zippedsize) (zipratio) (mm)-(dd)-(yy|yyyy) (HH):(MM) (cksum) (fname) +# or: (yyyy)-(mm)-(dd) +my $regex_nonzipinfo_line = qr"^\s*(\d+)\s+(\S+)\s+(\d+)\s+(-?\d+\%)\s+(\d+)-(\d?\d)-(\d+)\s+(\d?\d):(\d\d)\s+([0-9a-f]+)\s\s(.*)$"; + +# +# Main code +# + +die "uzip: missing command and/or archive arguments\n" if ($#ARGV < 1); + +# Initialization of some global variables +my $cmd = shift; +my %known = ( './' => 1 ); +my %pending = (); +my $oldpwd = POSIX::getcwd(); +my $archive = shift; +my $aarchive = absolutize($archive, $oldpwd); +my $cmd_list = ($op_has_zipinfo ? $cmd_list_zi : $cmd_list_nzi); +## WIN32 +## my ($qarchive, $aqarchive) = map (quotemeta, $archive, $aarchive); +my ($qarchive, $aqarchive) = ($archive, $aarchive); + +# Strip all "." and ".." path components from a pathname. +sub zipfs_canonicalize_pathname($) { + my ($fname) = @_; + $fname =~ s,/+,/,g; + $fname =~ s,(^|/)(?:\.?\./)+,$1,; + return $fname; +} + +# The Midnight Commander never calls this script with archive pathnames +# starting with either "./" or "../". Some ZIP files contain such names, +# so we need to build a translation table for them. +my $zipfs_realpathname_table = undef; +sub zipfs_realpathname($) { + my ($fname) = @_; + + if (!defined($zipfs_realpathname_table)) { + $zipfs_realpathname_table = {}; + if (!open(ZIP, "$cmd_list $qarchive |")) { + return $fname; + } + foreach my $line () { + $line =~ s/\r*\n*$//; + if ($op_has_zipinfo) { + if ($line =~ $regex_zipinfo_line) { + my ($fname) = ($14); + $zipfs_realpathname_table->{zipfs_canonicalize_pathname($fname)} = $fname; + } + } else { + if ($line =~ $regex_nonzipinfo_line) { + my ($fname) = ($11); + $zipfs_realpathname_table->{zipfs_canonicalize_pathname($fname)} = $fname; + } + } + } + if (!close(ZIP)) { + return $fname; + } + } + if (exists($zipfs_realpathname_table->{$fname})) { + return $zipfs_realpathname_table->{$fname}; + } + return $fname; +} + +if ($cmd eq 'list') { &mczipfs_list(@ARGV); } +if ($cmd eq 'rm') { &mczipfs_rm(@ARGV); } +if ($cmd eq 'rmdir') { &mczipfs_rmdir(@ARGV); } +if ($cmd eq 'mkdir') { &mczipfs_mkdir(@ARGV); } +if ($cmd eq 'copyin') { &mczipfs_copyin(@ARGV); } +if ($cmd eq 'copyout') { &mczipfs_copyout(@ARGV); } +if ($cmd eq 'run') { &mczipfs_run(@ARGV); } +#if ($cmd eq 'mklink') { &mczipfs_mklink(@ARGV); } # Not supported by MC extfs +#if ($cmd eq 'linkout') { &mczipfs_linkout(@ARGV); } # Not supported by MC extfs +exit 1; + +# Remove a file from the archive. +sub mczipfs_rm { + my ($qfile) = map { &zipquotemeta(zipfs_realpathname($_)) } @_; + + # "./" at the beginning of pathnames is stripped by Info-ZIP, + # so convert it to "[.]/" to prevent stripping. + $qfile =~ s/^\\\./[.]/; + + &checkargs(1, 'archive file', @_); + &safesystem("$cmd_delete $qarchive $qfile >/dev/null"); + exit; +} + +# Remove an empty directory from the archive. +# The only difference from mczipfs_rm is that we append an +# additional slash to the directory name to remove. I am not +# sure this is absolutely necessary, but it doesn't hurt. +sub mczipfs_rmdir { + my ($qfile) = map { &zipquotemeta(zipfs_realpathname($_)) } @_; + &checkargs(1, 'archive directory', @_); + &safesystem("$cmd_delete $qarchive $qfile/ >/dev/null", 12); + exit; +} + +# Extract a file from the archive. +# Note that we don't need to check if the file is a link, +# because mc apparently doesn't call copyout for symbolic links. +sub mczipfs_copyout { + my ($qafile, $qfsfile) = map { &zipquotemeta(zipfs_realpathname($_)) } @_; + &checkargs(1, 'archive file', @_); + &checkargs(2, 'local file', @_); + &safesystem("$cmd_extract $qarchive $qafile > $qfsfile", 11); + exit; +} + +# Add a file to the archive. +# This is done by making a temporary directory, in which +# we create a symlink the original file (with a new name). +# Zip is then run to include the real file in the archive, +# with the name of the symbolic link. +# Here we also doesn't need to check for symbolic links, +# because the mc extfs doesn't allow adding of symbolic +# links. +sub mczipfs_copyin { + my ($afile, $fsfile) = @_; + &checkargs(1, 'archive file', @_); + &checkargs(2, 'local file', @_); + my ($qafile) = quotemeta $afile; + $fsfile = &absolutize($fsfile, $oldpwd); + my $adir = File::Basename::dirname($afile); + + my $tmpdir = &mktmpdir(); + chdir $tmpdir || &croak("chdir $tmpdir failed"); + &mkdirs($adir, 0700); + symlink ($fsfile, $afile) || &croak("link $afile failed"); + &safesystem("$cmd_add $aqarchive $qafile >/dev/null"); + unlink $afile || &croak("unlink $afile failed"); + &rmdirs($adir); + chdir $oldpwd || &croak("chdir $oldpwd failed"); + rmdir $tmpdir || &croak("rmdir $tmpdir failed"); + exit; +} + +# Add an empty directory the the archive. +# This is similar to mczipfs_copyin, except that we don't need +# to use symlinks. +sub mczipfs_mkdir { + my ($dir) = @_; + &checkargs(1, 'directory', @_); + my ($qdir) = quotemeta $dir; + + my $tmpdir = &mktmpdir(); + chdir $tmpdir || &croak("chdir $tmpdir failed"); + &mkdirs($dir, 0700); + &safesystem("$cmd_add $aqarchive $qdir >/dev/null"); + &rmdirs($dir); + chdir $oldpwd || &croak("chdir $oldpwd failed"); + rmdir $tmpdir || &croak("rmdir $tmpdir failed"); + exit; +} + +# Add a link to the archive. This operation is not used yet, +# because it is not supported by the MC extfs. +sub mczipfs_mklink { + my ($linkdest, $afile) = @_; + &checkargs(1, 'link destination', @_); + &checkargs(2, 'archive file', @_); + my ($qafile) = quotemeta $afile; + my $adir = File::Basename::dirname($afile); + + my $tmpdir = &mktmpdir(); + chdir $tmpdir || &croak("chdir $tmpdir failed"); + &mkdirs($adir, 0700); + symlink ($linkdest, $afile) || &croak("link $afile failed"); + &safesystem("$cmd_addlink $aqarchive $qafile >/dev/null"); + unlink $afile || &croak("unlink $afile failed"); + &rmdirs($adir); + chdir $oldpwd || &croak("chdir $oldpwd failed"); + rmdir $tmpdir || &croak("rmdir $tmpdir failed"); + exit; +} + +# This operation is not used yet, because it is not +# supported by the MC extfs. +sub mczipfs_linkout { + my ($afile, $fsfile) = @_; + &checkargs(1, 'archive file', @_); + &checkargs(2, 'local file', @_); + my ($qafile) = map { &zipquotemeta($_) } $afile; + + my $linkdest = &get_link_destination($afile); + symlink ($linkdest, $fsfile) || &croak("link $fsfile failed"); + exit; +} + +# Use unzip to find the link destination of a certain file in the +# archive. +sub get_link_destination { + my ($afile) = @_; + my ($qafile) = map { &zipquotemeta($_) } $afile; + my $linkdest = safeticks("$cmd_extract $qarchive $qafile"); + &croak ("extract failed", "link destination of $afile not found") + if (!defined $linkdest || $linkdest eq ''); + return $linkdest; +} + +# List files in the archive. +# Because mc currently doesn't allow a file's parent directory +# to be listed after the file itself, we need to do some +# rearranging of the output. Most of this is done in +# checked_print_file. +sub mczipfs_list { + open (PIPE, "$cmd_list $qarchive |") || &croak("$app_unzip failed"); + if ($op_has_zipinfo) { + while () { + chomp; + next if /^Archive:/; + next if /^\d+ file/; + next if /^Empty zipfile\.$/; + my @match = /$regex_zipinfo_line/; + next if ($#match != 13); + &checked_print_file(@match); + } + } else { + while () { + chomp; + my @match = /$regex_nonzipinfo_line/; + next if ($#match != 10); + + # Massage the date. + my ($year, $month, $day) = $match[4] > 12 + ? ($match[4], $match[5], $match[6]) # 4,5,6 = Y,M,D + : ($match[6], $match[4], $match[5]); # 4,5,6 = M,D,Y + $year += ($year < 70 ? 2000 : 1900) if $year < 100; # Fix 2-digit year. + + my @rmatch = ('', '', 'unknown', $match[0], '', $match[2], $match[1], + $year, $month, $day, $match[7], $match[8], "00", $match[10]); + &checked_print_file(@rmatch); + } + } + if (!close (PIPE)) { + &croak("$app_unzip failed") if ($! != 0); + &croak("$app_unzip failed", 'non-zero exit status ('.($? >> 8).')') + } + + foreach my $key (sort keys %pending) { + foreach my $file (@{ $pending{$key} }) { + &print_file(@{ $file }); + } + } + + exit; +} + +# Execute a file in the archive, by first extracting it to a +# temporary directory. The name of the extracted file will be +# the same as the name of it in the archive. +sub mczipfs_run { + my ($afile) = @_; + &checkargs(1, 'archive file', @_); + my $qafile = &zipquotemeta(zipfs_realpathname($afile)); + my $tmpdir = &mktmpdir(); + my $tmpfile = File::Basename::basename($afile); + + chdir $tmpdir || &croak("chdir $tmpdir failed"); + &safesystem("$cmd_extract $aqarchive $qafile > $tmpfile"); + chmod 0700, $tmpfile; + &safesystem("./$tmpfile"); + unlink $tmpfile || &croak("rm $tmpfile failed"); + chdir $oldpwd || &croak("chdir $oldpwd failed"); + rmdir $tmpdir || &croak("rmdir $tmpdir failed"); + exit; +} + +# This is called prior to printing the listing of a file. +# A check is done to see if the parent directory of the file has already +# been printed or not. If it hasn't, we must cache it (in %pending) and +# print it later once the parent directory has been listed. When all +# files have been processed, there may still be some that haven't been +# printed because their parent directories weren't listed at all. These +# files are dealt with in mczipfs_list. +sub checked_print_file { + my @waiting = ([ @_ ]); + + while ($#waiting != -1) { + my $item = shift @waiting; + my $filename = ${$item}[13]; + my $dirname = File::Basename::dirname($filename) . '/'; + + if (exists $known{$dirname}) { + &print_file(@{$item}); + if ($filename =~ /\/$/) { + $known{$filename} = 1; + if (exists $pending{$filename}) { + push @waiting, @{ $pending{$filename} }; + delete $pending{$filename}; + } + } + } else { + push @{$pending{$dirname}}, $item; + } + } +} + +# Print the mc extfs listing of a file from a set of parsed fields. +# If the file is a link, we extract it from the zip archive and +# include the output as the link destination. Because this output +# is not newline terminated, we must execute unzip once for each +# link file encountered. +sub print_file { + my ($perms,$zipver,$platform,$realsize,$format,$cmpsize,$comp,$year,$mon,$day,$hours,$mins,$secs,$filename) = @_; + if ($platform ne 'unx') { + $perms = ($filename =~ /\/$/ ? 'drwxr-xr-x' : '-rw-r--r--'); + } + # adjust abnormal perms on directory + if ($platform eq 'unx' && $filename =~ /\/$/ && $perms =~ /^\?(.*)$/) { + $perms = 'd'.$1; + } + printf "%-10s 1 %-8d %-8d %8s %s/%s/%s %s:%s:%s %s", $perms, $<, + $(, $realsize, $mon, $day, $year, $hours, $mins, $secs, $filename; + if ($platform eq 'unx' && $perms =~ /^l/) { + my $linkdest = &get_link_destination($filename); + print " -> $linkdest"; + } + print "\n"; +} + +# Die with a reasonable error message. +sub croak { + my ($command, $desc) = @_; + die "uzip ($cmd): $command - $desc\n" if (defined $desc); + die "uzip ($cmd): $command - $!\n"; +} + +# Make a set of directories, like the command `mkdir -p'. +# This subroutine has been tailored for this script, and +# because of that, it ignored the directory name '.'. +sub mkdirs { + my ($dirs, $mode) = @_; + $dirs = &cleandirs($dirs); + return if ($dirs eq '.'); + + my $newpos = -1; + while (($newpos = index($dirs, '/', $newpos+1)) != -1) { + my $dir = substr($dirs, 0, $newpos); + mkdir ($dir, $mode) || &croak("mkdir $dir failed"); + } + mkdir ($dirs, $mode) || &croak("mkdir $dirs failed"); +} + +# Remove a set of directories, failing if the directories +# contain other files. +# This subroutine has been tailored for this script, and +# because of that, it ignored the directory name '.'. +sub rmdirs { + my ($dirs) = @_; + $dirs = &cleandirs($dirs); + return if ($dirs eq '.'); + + rmdir $dirs || &croak("rmdir $dirs failed"); + my $newpos = length($dirs); + while (($newpos = rindex($dirs, '/', $newpos-1)) != -1) { + my $dir = substr($dirs, 0, $newpos); + rmdir $dir || &croak("rmdir $dir failed"); + } +} + +# Return a semi-canonical directory name. +sub cleandirs { + my ($dir) = @_; + $dir =~ s:/+:/:g; + $dir =~ s:/*$::; + return $dir; +} + +# Make a temporary directory with mode 0700. +sub mktmpdir { + use File::Temp qw(mkdtemp); + my $template = "/tmp/mcuzipfs.XXXXXX"; + $template="$ENV{MC_TMPDIR}/mcuzipfs.XXXXXX" if ($ENV{MC_TMPDIR}); + return mkdtemp($template); +} + +# Make a filename absolute and return it. +sub absolutize { + my ($file, $pwd) = @_; + return "$pwd/$file" if ($file !~ /^\//); + return $file; +} + +# Like the system built-in function, but with error checking. +# The other argument is an exit status to allow. +sub safesystem { + my ($command, @allowrc) = @_; + my ($desc) = ($command =~ /^([^ ]*) */); + $desc = File::Basename::basename($desc); + system $command; + my $rc = $?; + &croak("`$desc' failed") if (($rc & 0xFF) != 0); + if ($rc != 0) { + $rc = $rc >> 8; + foreach my $arc (@allowrc) { + return if ($rc == $arc); + } + &croak("`$desc' failed", "non-zero exit status ($rc)"); + } +} + +# Like backticks built-in, but with error checking. +sub safeticks { + my ($command, @allowrc) = @_; + my ($desc) = ($command =~ /^([^ ]*) /); + $desc = File::Basename::basename($desc); + my $out = `$command`; + my $rc = $?; + &croak("`$desc' failed") if (($rc & 0xFF) != 0); + if ($rc != 0) { + $rc = $rc >> 8; + foreach my $arc (@allowrc) { + return if ($rc == $arc); + } + &croak("`$desc' failed", "non-zero exit status ($rc)"); + } + return $out; +} + +# Make sure enough arguments are supplied, or die. +sub checkargs { + my $count = shift; + my $desc = shift; + &croak('missing argument', $desc) if ($count-1 > $#_); +} + +# Quote zip wildcard metacharacters. Unfortunately Info-ZIP zip and unzip +# on unix interpret some wildcards in filenames, despite the fact that +# the shell already does this. Thus this function. +sub zipquotemeta { + my ($name) = @_; + my $out = ''; + for (my $c = 0; $c < length $name; $c++) { + my $ch = substr($name, $c, 1); +##WIN32 $out .= '\\' if (index('*?[]\\', $ch) != -1); + $out .= '\\' if (index('*?', $ch) != -1); + $out .= $ch; + } +##WIN32 return quotemeta($out); + return $out; +} From 098b3b0ca71fa69df25469b7645734480aa4ef07 Mon Sep 17 00:00:00 2001 From: adamyg Date: Wed, 16 Mar 2022 22:21:02 +0800 Subject: [PATCH 3/6] #21 --- mcsrc/src/vfs/fish/fish.c | 18 ++-- mcwin32/libz/Makefile.in | 3 +- mcwin32/src/win32_pipe.c | 4 +- mcwin32/src/win32_trace.c | 22 +++-- mcwin32/src/win32_utl.c | 194 +++++++++++++++++++------------------- 5 files changed, 124 insertions(+), 117 deletions(-) diff --git a/mcsrc/src/vfs/fish/fish.c b/mcsrc/src/vfs/fish/fish.c index 22cd5a47..3da32e64 100644 --- a/mcsrc/src/vfs/fish/fish.c +++ b/mcsrc/src/vfs/fish/fish.c @@ -425,6 +425,7 @@ static void fish_pipeopen (struct vfs_s_super *super, const char *path, const char *argv[]) { #if defined(WIN32) //WIN32, fish + fish_super_t *fish_super = FISH_SUPER (super); char cmd[1024], t_path[MAX_PATH] = {0}; GError *error = NULL; int fds[2] = {-1, -1}; @@ -444,18 +445,23 @@ fish_pipeopen (struct vfs_s_super *super, const char *path, const char *argv[]) } } - // WinRSH + // WinXSH if (path != t_path && 0 != (syslen = w32_getsysdirA(SYSDIR_PROGRAM_FILES, t_path, sizeof(t_path)))) { - snprintf (t_path + syslen, (sizeof(t_path)-1) - syslen, "\\WinRSH\\ssh.exe"); + snprintf (t_path + syslen, (sizeof(t_path)-1) - syslen, "\\WinXSH\\ssh.exe"); if (0 == access(t_path, 0)) { path = t_path; + } else { + snprintf (t_path + syslen, (sizeof(t_path)-1) - syslen, "\\WinXSH\\slogin.exe"); + if (0 == access(t_path, 0)) { + path = t_path; + } } } } else if (0 == strcmp(path, "rsh")) { - // WinRSH + // WinXSH if (0 != (syslen = w32_getsysdirA(SYSDIR_PROGRAM_FILES, t_path, sizeof(t_path)))) { - snprintf (t_path + syslen, (sizeof(t_path)-1) - syslen, "\\WinRSH\\rsh.exe"); + snprintf (t_path + syslen, (sizeof(t_path)-1) - syslen, "\\WinXSH\\rsh.exe"); if (0 == access(t_path, 0)) { path = t_path; } @@ -480,8 +486,8 @@ fish_pipeopen (struct vfs_s_super *super, const char *path, const char *argv[]) g_error_free (error); } - FISH_SUPER(super)->sockr = fds[0]; - FISH_SUPER(super)->sockw = fds[1]; + fish_super->sockr = fds[0]; + fish_super->sockw = fds[1]; #else int fileset1[2], fileset2[2]; diff --git a/mcwin32/libz/Makefile.in b/mcwin32/libz/Makefile.in index 73e31f7d..64633629 100644 --- a/mcwin32/libz/Makefile.in +++ b/mcwin32/libz/Makefile.in @@ -1,6 +1,5 @@ - # -*- mode: mak; indent-tabs-mode: t; tab-width: 8 -*- -# $Id: Makefile.in,v 1.6 2022/03/05 08:28:22 cvsuser Exp $ +# $Id: Makefile.in,v 1.7 2022/03/16 14:01:00 cvsuser Exp $ # libz makefile # # diff --git a/mcwin32/src/win32_pipe.c b/mcwin32/src/win32_pipe.c index 6c8f8132..7ae9269c 100644 --- a/mcwin32/src/win32_pipe.c +++ b/mcwin32/src/win32_pipe.c @@ -78,10 +78,10 @@ mc_popen2 (const char *command, int *fds, GError **error) win32_exec_t *args = (win32_exec_t *)(p + 1); int t_fdin = -1, t_fdout = -1; - if ((t_fdin = _open_osfhandle((long)args->hOutput, _O_BINARY)) >= 0) { + if ((t_fdin = _open_osfhandle((long)args->hOutput, _O_NOINHERIT|_O_BINARY|_O_RDONLY)) >= 0) { args->hOutput = 0; // change ownership - if ((t_fdout = _open_osfhandle((long)args->hInput, _O_BINARY)) >= 0) { + if ((t_fdout = _open_osfhandle((long)args->hInput, _O_NOINHERIT|_O_BINARY|_O_WRONLY)) >= 0) { const int handle = (int)args->hProc; args->hInput = 0; // change ownership diff --git a/mcwin32/src/win32_trace.c b/mcwin32/src/win32_trace.c index 12f5529d..4f7a94f8 100644 --- a/mcwin32/src/win32_trace.c +++ b/mcwin32/src/win32_trace.c @@ -62,18 +62,22 @@ static void w32_trace_init(void) { if (! x_tracing_started) { -#if !defined(_DEBUG) - if (NULL == getenv("MC_TRACE")) { - return; //optional - } -#endif //_DEBUG + const char *mc_trace = getenv("MC_TRACE"); + const char *trace_file = (mc_trace ? mc_trace : TRACE_FILE); + +#if defined(NDEBUG) + if (NULL == mc_trace) return; //optional +#endif //NDEBUG - if (NULL == (x_trace_file = fopen(TRACE_FILE, "wt"))) { - printf("Midnight Commander[DEBUG]: cannot open trace file '" TRACE_FILE "': %s \n", strerror(errno)); + if (NULL == (x_trace_file = fopen(trace_file, "wt"))) { + printf("Midnight Commander[DEBUG]: cannot open trace file '%s' : %s \n", trace_file, strerror(errno)); } else if (! x_tracing_init) { - x_tracing_init = 0; - // atexit(w32_trace_close); +#if !defined(NDEBUG) + printf("Midnight Commander[DEBUG]: opened trace file '%s'\n", trace_file); +#endif + // atexit(w32_trace_close); + x_tracing_init = 1; } x_tracing_started = 1; } diff --git a/mcwin32/src/win32_utl.c b/mcwin32/src/win32_utl.c index e4ec4ddc..c64d2826 100644 --- a/mcwin32/src/win32_utl.c +++ b/mcwin32/src/win32_utl.c @@ -823,7 +823,7 @@ my_setpathenv(const char *name, const char *value, int overwrite, int quote_ws) if ((1 == overwrite) || NULL == getenv(name)) { strncpy(path, value, sizeof(path)-1); - canonicalize_pathname(path); + canonicalize_pathname (path); dospath(path); #if defined(__WATCOMC__) @@ -1854,6 +1854,25 @@ tilde_expand(const char *directory) * * Notes: Sourced from lib/utilunix.c */ + +static int +current_drive(char *path) +{ + int driveno = w32_getdrive(); + + if (driveno <= 0) driveno = w32_getlastdrive(); + if (driveno <= 0) driveno = w32_getsystemdrive(); + if (driveno > 0) { + path[0] = driveno + ('A' - 1); + path[1] = ':'; + path[2] = PATH_SEP; + path[3] = 0; + return 1; + } + return 0; +} + + void custom_canonicalize_pathname(char *orgpath, CANON_PATH_FLAGS flags) { @@ -1861,53 +1880,42 @@ custom_canonicalize_pathname(char *orgpath, CANON_PATH_FLAGS flags) char *lpath = orgpath; /* path without leading UNC part */ int unc = FALSE; char *p, *s; - size_t len; /* Standardise to the system seperator */ - if (0 == lpath[0]) { + if (0 == lpath[0]) return; /* empty */ - } - for (s = lpath; *s; ++s) { - if ('\\' == *s || '/' == *s) { + + for (s = lpath; *s; ++s) + if ('\\' == *s || '/' == *s) *s = PATH_SEP; - } - } /* Detect and preserve UNC paths: "//server/" */ - if ((flags & CANON_PATH_GUARDUNC) && - lpath[0] == PATH_SEP && lpath[1] == PATH_SEP && lpath[2]) { - p = lpath + 2; - while (p[0] && p[0] != PATH_SEP) { - ++p; - } + if ((flags & CANON_PATH_GUARDUNC) != 0 && IS_PATH_SEP (lpath[0]) && IS_PATH_SEP (lpath[1]) && lpath[2]) + { + for (p = lpath + 2; p[0] != '\0' && !IS_PATH_SEP (p[0]); p++) + ; - if (p[0] == PATH_SEP && p > (orgpath + 2)) { - if (0 == strcmp(p + 1, "..")) { /* "//servername/.." --> "X:/" */ - int driveno = w32_getdrive(); - if (driveno <= 0) driveno = w32_getlastdrive(); - if (driveno <= 0) driveno = w32_getsystemdrive(); - if (driveno > 0) { - lpath[0] = driveno + ('A' - 1); - lpath[1] = ':'; - lpath[2] = PATH_SEP; - lpath[3] = 0; + if (p[0] == PATH_SEP && p > (orgpath + 2)) + { + if (0 == strcmp(p + 1, "..")) + { /* "//servername/.." --> "X:/" */ + if (current_drive (lpath)) return; - } } lpath = p; unc = TRUE; } } - if (0 == lpath[0] || 0 == lpath[1]) { + if (0 == lpath[0] || 0 == lpath[1]) return; - } /* DOS'ish * o standardize seperator * o preserve leading drive */ - if (!unc) { + if (!unc) + { if (PATH_SEP == lpath[0] && ':' == lpath[2] && isalpha((unsigned char)lpath[1])) { str_move (lpath, lpath + 1); /* /X:, remove leading '/' vfs name mangling */ @@ -1924,96 +1932,81 @@ custom_canonicalize_pathname(char *orgpath, CANON_PATH_FLAGS flags) if (flags & CANON_PATH_JOINSLASHES) { /* Collapse multiple slashes */ - p = lpath; - while (*p) - { - if (p[0] == PATH_SEP && p[1] == PATH_SEP && (p == lpath || *(p - 1) != ':')) + for (p = lpath; *p != '\0'; p++) + if (IS_PATH_SEP (p[0]) && IS_PATH_SEP (p[1]) && (p == lpath || *(p - 1) != ':')) { s = p + 1; - while (*(++s) == PATH_SEP); + while (IS_PATH_SEP (*(++s))) + ; str_move (p + 1, s); } - p++; - } - } - if (flags & CANON_PATH_JOINSLASHES) - { /* Collapse "/./" -> "/" */ - p = lpath; - while (*p) - { - if (p[0] == PATH_SEP && p[1] == '.' && p[2] == PATH_SEP) + for (p = lpath; *p != '\0';) + if (IS_PATH_SEP (p[0]) && p[1] == '.' && IS_PATH_SEP (p[2])) str_move (p, p + 2); else p++; - } } if (flags & CANON_PATH_REMSLASHDOTS) { + size_t len; + /* Remove trailing slashes */ - p = lpath + strlen (lpath) - 1; - while (p > lpath && *p == PATH_SEP) + for (p = lpath + strlen (lpath) - 1; p > lpath && IS_PATH_SEP (*p); p--) { - if (p >= lpath - (url_delim_len + 1) - && strncmp (p - url_delim_len + 1, VFS_PATH_URL_DELIMITER, url_delim_len) == 0) + if (p >= lpath + url_delim_len - 1 + && strncmp (p - url_delim_len + 1, VFS_PATH_URL_DELIMITER, url_delim_len) == 0) break; - *p-- = 0; + *p = '\0'; } /* Remove leading "./" */ - if (lpath[0] == '.' && lpath[1] == PATH_SEP) + if (lpath[0] == '.' && IS_PATH_SEP (lpath[1])) { - if (lpath[2] == 0) + if (lpath[2] == '\0') { - lpath[1] = 0; + lpath[1] = '\0'; return; } - else - { - str_move (lpath, lpath + 2); - } + + str_move (lpath, lpath + 2); } /* Remove trailing "/" or "/." */ len = strlen (lpath); if (len < 2) return; - if (lpath[len - 1] == PATH_SEP + + if (IS_PATH_SEP (lpath[len - 1]) && (len < url_delim_len - || strncmp (lpath + len - url_delim_len, VFS_PATH_URL_DELIMITER, url_delim_len) != 0)) - { + || strncmp (lpath + len - url_delim_len, VFS_PATH_URL_DELIMITER, + url_delim_len) != 0)) lpath[len - 1] = '\0'; - } - else + else if (lpath[len - 1] == '.' && IS_PATH_SEP (lpath[len - 2])) { - if (lpath[len - 1] == '.' && lpath[len - 2] == PATH_SEP) + if (len == 2) { - if (len == 2) - { - lpath[1] = '\0'; - return; - } - else - { - lpath[len - 2] = '\0'; - } + lpath[1] = '\0'; + return; } + + lpath[len - 2] = '\0'; } } + /* Collapse "/.." with the previous part of path */ if (flags & CANON_PATH_REMDOUBLEDOTS) { #ifdef HAVE_CHARSET const size_t enc_prefix_len = strlen (VFS_ENCODING_PREFIX); #endif /* HAVE_CHARSET */ - /* Collapse "/.." with the previous part of path */ - p = lpath; - while (p[0] && p[1] && p[2]) + for (p = lpath; p[0] != '\0' && p[1] != '\0' && p[2] != '\0';) { - if ((p[0] != PATH_SEP || p[1] != '.' || p[2] != '.') || (p[3] != PATH_SEP && p[3] != 0)) + if (!IS_PATH_SEP (p[0]) || p[1] != '.' || p[2] != '.' + || (!IS_PATH_SEP (p[3]) && p[3] != '\0')) { p++; continue; @@ -2022,30 +2015,38 @@ custom_canonicalize_pathname(char *orgpath, CANON_PATH_FLAGS flags) /* search for the previous token */ s = p - 1; if (s >= lpath + url_delim_len - 2 - && strncmp (s - url_delim_len + 2, VFS_PATH_URL_DELIMITER, url_delim_len) == 0) + && strncmp (s - url_delim_len + 2, VFS_PATH_URL_DELIMITER, url_delim_len) == 0) { s -= (url_delim_len - 2); - while (s >= lpath && *s-- != PATH_SEP); + while (s >= lpath && !IS_PATH_SEP (*s--)) + ; } while (s >= lpath) { if (s - url_delim_len > lpath - && strncmp (s - url_delim_len, VFS_PATH_URL_DELIMITER, url_delim_len) == 0) + && strncmp (s - url_delim_len, VFS_PATH_URL_DELIMITER, url_delim_len) == 0) { char *vfs_prefix = s - url_delim_len; - struct vfs_class *vclass; + vfs_class *vclass; - while (vfs_prefix > lpath && *--vfs_prefix != PATH_SEP); - if (*vfs_prefix == PATH_SEP) + while (vfs_prefix > lpath && !IS_PATH_SEP (*--vfs_prefix)) + ; + if (IS_PATH_SEP (*vfs_prefix)) vfs_prefix++; - *(s - url_delim_len) = '\0'; + vclass = vfs_prefix_to_class (vfs_prefix); *(s - url_delim_len) = *VFS_PATH_URL_DELIMITER; + + if (vclass != NULL && (vclass->flags & VFSF_REMOTE) != 0) + { + s = vfs_prefix; + continue; + } } - if (*s == PATH_SEP) + if (IS_PATH_SEP (*s)) break; s--; @@ -2088,9 +2089,7 @@ custom_canonicalize_pathname(char *orgpath, CANON_PATH_FLAGS flags) { /* "token/.." -> "." */ if (lpath[0] != PATH_SEP) - { lpath[0] = '.'; - } lpath[1] = 0; } else @@ -2108,12 +2107,11 @@ custom_canonicalize_pathname(char *orgpath, CANON_PATH_FLAGS flags) s[2] = '\0'; /* search for the previous token */ - /* s[-1] == PATH_SEP */ - p = s - 1; - while (p >= lpath && *p != PATH_SEP) - p--; + /* IS_PATH_SEP (s[-1]) */ + for (p = s - 1; p >= lpath && !IS_PATH_SEP (*p); p--) + ; - if (p != NULL) + if (p >= lpath) continue; } #endif /* HAVE_CHARSET */ @@ -2188,19 +2186,20 @@ mc_build_filenamev(const char *first_element, va_list args) canonicalize_pathname (tmp_element); len = strlen (tmp_element); - start = (tmp_element[0] == PATH_SEP) ? tmp_element + 1 : tmp_element; + start = IS_PATH_SEP (tmp_element[0]) ? tmp_element + 1 : tmp_element; g_string_append (path, start); - if (tmp_element[len - 1] != PATH_SEP && element != NULL) { + if (!IS_PATH_SEP (tmp_element[len - 1]) && element != NULL) g_string_append_c (path, PATH_SEP); - } g_free (tmp_element); } } while (element != NULL); - if (absolute) { - if (! path->len || ':' != path->str[1] /*not-drive*/) { + if (absolute) + { + if (! path->len || ':' != path->str[1] /*not-drive*/) + { g_string_prepend_c (path, PATH_SEP); // reapply leading //WIN32, drive @@ -2209,9 +2208,9 @@ mc_build_filenamev(const char *first_element, va_list args) int driveno = w32_getdrive(); if (driveno <= 0) driveno = w32_getlastdrive(); - // see: vfs_canon() generally when we are returning - // from a ftp/sftp or UNC reference. - if (driveno > 0) { + // see: vfs_canon() generally when we are returning from a ftp/sftp or UNC reference. + if (driveno > 0) + { char drive[3] = "X:"; drive[0] = driveno + ('A' - 1); g_string_prepend (path, drive); // "/" --> "X:/" @@ -2221,7 +2220,6 @@ mc_build_filenamev(const char *first_element, va_list args) } ret = g_string_free (path, FALSE); - canonicalize_pathname (ret); return ret; From 3953578581a7ec55df951b616680568d1a4543ed Mon Sep 17 00:00:00 2001 From: adamyg Date: Mon, 21 Mar 2022 10:56:59 +0800 Subject: [PATCH 4/6] ci: clean rule --- mcwin32/Makefile.in | 2 +- mcwin32/libmbedtls/Makefile.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mcwin32/Makefile.in b/mcwin32/Makefile.in index db3f4154..157eecba 100644 --- a/mcwin32/Makefile.in +++ b/mcwin32/Makefile.in @@ -757,7 +757,7 @@ gettext: $(MSGDIRS) $(MSGOBJS) CONFIGURATION_WIN32=\ $(addprefix $(D_ETC)/,$(CFG_WIN32_ETC)) \ $(addprefix $(D_PLUGIN)/,$(CFG_WIN32_PLUGIN)) \ - $(addprefix $(WIN32_PLUGIN_SRC)/extfs.d/,$(CFG_WIN32_PLUGIN_EXTFS_D)) \ + $(addprefix $(D_PLUGIN)/extfs.d/,$(CFG_WIN32_PLUGIN_EXTFS_D)) \ $(addprefix $(D_SHARE)/skins/,$(CFG_WIN32_SKINS)) .PHONY: configuration-win32 diff --git a/mcwin32/libmbedtls/Makefile.in b/mcwin32/libmbedtls/Makefile.in index f825a0ef..86040c36 100644 --- a/mcwin32/libmbedtls/Makefile.in +++ b/mcwin32/libmbedtls/Makefile.in @@ -1,5 +1,5 @@ # -*- mode: mak; indent-tabs-mode: t; tab-width: 8 -*- -# $Id: Makefile.in,v 1.7 2022/03/05 08:24:49 cvsuser Exp $ +# $Id: Makefile.in,v 1.8 2022/03/21 02:45:11 cvsuser Exp $ # libmbedtls makefile. # # @@ -85,7 +85,7 @@ else CFLAGS+= $(CDEBUG) $(CWARN) $(CINCLUDE) $(CEXTRA) $(XFLAGS) LDFLAGS= $(LDDEBUG) @LDFLAGS@ endif -LDLIBS= -L$(D_LIB) $(D_LIB)/$(LP)regex$(A) @LIBS@ @LIBM@ @EXTRALIBS@ +LDLIBS= -L$(D_LIB) @LIBS@ @LIBM@ @EXTRALIBS@ ARFLAGS= rcv RMFLAGS= -f From ac236ed1ee4934273efe7a79182c7d7153bc4243 Mon Sep 17 00:00:00 2001 From: adamyg Date: Mon, 21 Mar 2022 10:57:42 +0800 Subject: [PATCH 5/6] #21 - removed 2nd ssh --- mcsrc/src/vfs/fish/fish.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mcsrc/src/vfs/fish/fish.c b/mcsrc/src/vfs/fish/fish.c index 3da32e64..f66687c6 100644 --- a/mcsrc/src/vfs/fish/fish.c +++ b/mcsrc/src/vfs/fish/fish.c @@ -432,6 +432,7 @@ fish_pipeopen (struct vfs_s_super *super, const char *path, const char *argv[]) int syslen, len; if (0 == strcmp(path, "ssh")) { //FIXME +#if (1) // OpenSSH if (0 != (syslen = GetWindowsDirectoryA(t_path, sizeof(t_path)))) { snprintf (t_path + syslen, (sizeof(t_path)-1) - syslen, "\\System32\\OpenSSH\\ssh.exe"); //32-bit @@ -447,16 +448,15 @@ fish_pipeopen (struct vfs_s_super *super, const char *path, const char *argv[]) // WinXSH if (path != t_path && 0 != (syslen = w32_getsysdirA(SYSDIR_PROGRAM_FILES, t_path, sizeof(t_path)))) { - snprintf (t_path + syslen, (sizeof(t_path)-1) - syslen, "\\WinXSH\\ssh.exe"); + snprintf (t_path + syslen, (sizeof(t_path)-1) - syslen, "\\WinXSH\\slogin.exe"); if (0 == access(t_path, 0)) { path = t_path; - } else { - snprintf (t_path + syslen, (sizeof(t_path)-1) - syslen, "\\WinXSH\\slogin.exe"); - if (0 == access(t_path, 0)) { - path = t_path; - } } } +#else + snprintf (t_path, sizeof(t_path), "/devl/winrsh/bin.owc19/debug/slogin.exe"); + path = t_path; +#endif } else if (0 == strcmp(path, "rsh")) { // WinXSH From 4e93c7f8855fc3dd65c60bade0ddec518eb096c8 Mon Sep 17 00:00:00 2001 From: adamyg Date: Mon, 21 Mar 2022 10:57:57 +0800 Subject: [PATCH 6/6] build-226 #21 --- mcwin32/ChangeLog.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mcwin32/ChangeLog.txt b/mcwin32/ChangeLog.txt index 28db2158..84bc09c8 100644 --- a/mcwin32/ChangeLog.txt +++ b/mcwin32/ChangeLog.txt @@ -1,8 +1,11 @@ -Pending build-226 +Mon Mar 21 10:47:17 2022 adamy -Tue Mar 15 14:47:05 2022 adamy + * build-226 - * #21 - FISH enabled, OpenSSH required. + * #21 - FISH enabled + + o ssh - OpenSSH required (https://github.com/powershell/Win32-OpenSSH) or WinXRSH (below). + o rsh - WinRXH (https://github.com/adamyg/winxsh). Fri Mar 11 21:41:28 2022 adamy