lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-08-07 08:02:56 +03:00
Code Activity

tidy-up: replace tabs and other whitespace (#885)

Browse Source 
There are a few non-whitespace changes, see them here:
https://github.com/libssh2/libssh2/pull/885/files?w=1
This commit is contained in:
Viktor Szakats
2023-03-27 18:28:27 +02:00
committed by GitHub
parent 0d08974633
commit 2f16d8105c
104 changed files with 1107 additions and 1110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Makefile.am
View File

@@ -27,24 +27,24 @@ VCPROJ = win32/libssh2.vcproj
DISTCLEANFILES = $(DSP) DISTCLEANFILES = $(DSP)
VMSFILES = vms/libssh2_make_example.dcl vms/libssh2_make_help.dcl \ VMSFILES = vms/libssh2_make_example.dcl vms/libssh2_make_help.dcl \
vms/libssh2_make_kit.dcl vms/libssh2_make_lib.dcl vms/man2help.c \ vms/libssh2_make_kit.dcl vms/libssh2_make_lib.dcl vms/man2help.c \
vms/readme.vms vms/libssh2_config.h vms/readme.vms vms/libssh2_config.h
WIN32FILES = win32/GNUmakefile \ WIN32FILES = win32/GNUmakefile \
win32/libssh2_config.h win32/config.mk win32/rules.mk \ win32/libssh2_config.h win32/config.mk win32/rules.mk \
win32/Makefile.Watcom win32/libssh2.dsw win32/tests.dsp $(DSP) \ win32/Makefile.Watcom win32/libssh2.dsw win32/tests.dsp $(DSP) \
win32/msvcproj.head win32/msvcproj.foot win32/libssh2.rc win32/msvcproj.head win32/msvcproj.foot win32/libssh2.rc
OS400FILES = os400/README400 os400/initscript.sh os400/make.sh \ OS400FILES = os400/README400 os400/initscript.sh os400/make.sh \
os400/make-src.sh os400/make-rpg.sh os400/make-include.sh \ os400/make-src.sh os400/make-rpg.sh os400/make-include.sh \
os400/os400sys.c os400/ccsid.c \ os400/os400sys.c os400/ccsid.c \
os400/libssh2_config.h os400/macros.h os400/libssh2_ccsid.h \ os400/libssh2_config.h os400/macros.h os400/libssh2_ccsid.h \
os400/include/alloca.h os400/include/sys/socket.h os400/include/stdio.h \ os400/include/alloca.h os400/include/sys/socket.h os400/include/stdio.h \
os400/libssh2rpg/libssh2.rpgle.in \ os400/libssh2rpg/libssh2.rpgle.in \
os400/libssh2rpg/libssh2_ccsid.rpgle.in \ os400/libssh2rpg/libssh2_ccsid.rpgle.in \
os400/libssh2rpg/libssh2_publickey.rpgle \ os400/libssh2rpg/libssh2_publickey.rpgle \
os400/libssh2rpg/libssh2_sftp.rpgle \ os400/libssh2rpg/libssh2_sftp.rpgle \
Makefile.os400qc3.inc Makefile.os400qc3.inc
EXTRA_DIST = $(WIN32FILES) $(NETWAREFILES) get_ver.awk \ EXTRA_DIST = $(WIN32FILES) $(NETWAREFILES) get_ver.awk \
maketgz NMakefile RELEASE-NOTES libssh2.pc.in $(VMSFILES) config.rpath \ maketgz NMakefile RELEASE-NOTES libssh2.pc.in $(VMSFILES) config.rpath \
@@ -124,8 +124,7 @@ $(DSP): win32/msvcproj.head win32/msvcproj.foot Makefile.am
for file in $$sorted_hdrs; do \ for file in $$sorted_hdrs; do \
echo "# Begin Source File"; \ echo "# Begin Source File"; \
echo ""; \ echo ""; \
if [ "$$file" = "libssh2_config.h" ]; \ if [ "$$file" = "libssh2_config.h" ]; then \
then \
echo "SOURCE=.\\"$$file; \ echo "SOURCE=.\\"$$file; \
else \ else \
echo "SOURCE=..\\src\\"$$file; \ echo "SOURCE=..\\src\\"$$file; \

1
docs/libssh2_agent_connect.3
View File

@@ -20,4 +20,3 @@ Added in libssh2 1.2
.SH SEE ALSO .SH SEE ALSO
.BR libssh2_agent_init(3) .BR libssh2_agent_init(3)
.BR libssh2_agent_disconnect(3) .BR libssh2_agent_disconnect(3)

1
docs/libssh2_agent_get_identity_path.3
View File

@@ -19,4 +19,3 @@ Added in libssh2 1.9
.SH SEE ALSO .SH SEE ALSO
.BR libssh2_agent_init(3) .BR libssh2_agent_init(3)
.BR libssh2_agent_set_identity_path(3) .BR libssh2_agent_set_identity_path(3)

1
docs/libssh2_agent_list_identities.3
View File

@@ -21,4 +21,3 @@ Added in libssh2 1.2
.SH SEE ALSO .SH SEE ALSO
.BR libssh2_agent_connect(3) .BR libssh2_agent_connect(3)
.BR libssh2_agent_get_identity(3) .BR libssh2_agent_get_identity(3)

1
docs/libssh2_agent_set_identity_path.3
View File

@@ -19,4 +19,3 @@ Added in libssh2 1.9
.SH SEE ALSO .SH SEE ALSO
.BR libssh2_agent_init(3) .BR libssh2_agent_init(3)
.BR libssh2_agent_get_identity_path(3) .BR libssh2_agent_get_identity_path(3)

1
docs/libssh2_keepalive_config.3
View File

@@ -24,4 +24,3 @@ Nothing
Added in libssh2 1.2.5 Added in libssh2 1.2.5
.SH SEE ALSO .SH SEE ALSO
.BR libssh2_keepalive_send(3) .BR libssh2_keepalive_send(3)

1
docs/libssh2_knownhost_writefile.3
View File

@@ -26,4 +26,3 @@ Added in libssh2 1.2
.SH SEE ALSO .SH SEE ALSO
.BR libssh2_knownhost_readfile(3) .BR libssh2_knownhost_readfile(3)
.BR libssh2_knownhost_add(3) .BR libssh2_knownhost_add(3)

1
docs/libssh2_knownhost_writeline.3
View File

@@ -43,4 +43,3 @@ Added in libssh2 1.2
.BR libssh2_knownhost_get(3) .BR libssh2_knownhost_get(3)
.BR libssh2_knownhost_readline(3) .BR libssh2_knownhost_readline(3)
.BR libssh2_knownhost_writefile(3) .BR libssh2_knownhost_writefile(3)

1
docs/libssh2_scp_recv.3
View File

@@ -32,4 +32,3 @@ block.
.SH SEE ALSO .SH SEE ALSO
.BR libssh2_session_init_ex(3) .BR libssh2_session_init_ex(3)
.BR libssh2_channel_open_ex(3) .BR libssh2_channel_open_ex(3)

1
docs/libssh2_scp_recv2.3
View File

@@ -29,4 +29,3 @@ block.
.SH SEE ALSO .SH SEE ALSO
.BR libssh2_session_init_ex(3) .BR libssh2_session_init_ex(3)
.BR libssh2_channel_open_ex(3) .BR libssh2_channel_open_ex(3)

1
docs/libssh2_sftp_open_ex.3
View File

@@ -62,4 +62,3 @@ returned by the server.
block. block.
.SH SEE ALSO .SH SEE ALSO
.BR libssh2_sftp_close_handle(3) .BR libssh2_sftp_close_handle(3)

31
example/Makefile.am
View File

@@ -2,12 +2,31 @@ AUTOMAKE_OPTIONS = foreign nostdinc
EXTRA_DIST = libssh2_config_cmake.h.in CMakeLists.txt EXTRA_DIST = libssh2_config_cmake.h.in CMakeLists.txt
# samples # examples
noinst_PROGRAMS = direct_tcpip ssh2 scp scp_nonblock scp_write \ noinst_PROGRAMS = \
scp_write_nonblock sftp sftp_nonblock sftp_write sftp_write_nonblock \ direct_tcpip \
sftp_mkdir sftp_mkdir_nonblock sftp_RW_nonblock sftp_write_sliding \ scp \
sftpdir sftpdir_nonblock ssh2_exec ssh2_agent ssh2_agent_forwarding \ scp_nonblock \
ssh2_echo sftp_append subsystem_netconf tcpip-forward scp_write \
scp_write_nonblock \
sftp \
sftp_RW_nonblock \
sftp_append \
sftp_mkdir \
sftp_mkdir_nonblock \
sftp_nonblock \
sftp_write \
sftp_write_nonblock \
sftp_write_sliding \
sftpdir \
sftpdir_nonblock \
ssh2 \
ssh2_agent \
ssh2_agent_forwarding \
ssh2_echo \
ssh2_exec \
subsystem_netconf \
tcpip-forward
if HAVE_SYS_UN_H if HAVE_SYS_UN_H
noinst_PROGRAMS += x11 noinst_PROGRAMS += x11

8
maketgz
View File

@@ -37,7 +37,8 @@ fi
datestamp=`LC_TIME=C date -u` datestamp=`LC_TIME=C date -u`
# Replace in-place version number in header file: # Replace in-place version number in header file:
sed -i.bak -e 's/^#define LIBSSH2_VERSION .*/#define LIBSSH2_VERSION "'$libversion'"/g' \ sed -i.bak \
-e 's/^#define LIBSSH2_VERSION .*/#define LIBSSH2_VERSION "'$libversion'"/g' \
-e 's/^#define LIBSSH2_VERSION_NUM .*/#define LIBSSH2_VERSION_NUM 0x'$numeric'/g' \ -e 's/^#define LIBSSH2_VERSION_NUM .*/#define LIBSSH2_VERSION_NUM 0x'$numeric'/g' \
-e 's/^#define LIBSSH2_VERSION_MAJOR .*/#define LIBSSH2_VERSION_MAJOR '$major'/g' \ -e 's/^#define LIBSSH2_VERSION_MAJOR .*/#define LIBSSH2_VERSION_MAJOR '$major'/g' \
-e 's/^#define LIBSSH2_VERSION_MINOR .*/#define LIBSSH2_VERSION_MINOR '$minor'/g' \ -e 's/^#define LIBSSH2_VERSION_MINOR .*/#define LIBSSH2_VERSION_MINOR '$minor'/g' \
@@ -53,11 +54,10 @@ echo "datestamp $datestamp"
if test -n "$only"; then if test -n "$only"; then
# done! # done!
exit; exit
fi fi
findprog() findprog() {
{
file="$1" file="$1"
for part in `echo $PATH| tr ':' ' '`; do for part in `echo $PATH| tr ':' ' '`; do
path="$part/$file" path="$part/$file"

18
nw/GNUmakefile
View File

@@ -53,7 +53,7 @@ endif
# must be equal to DEBUG or NDEBUG # must be equal to DEBUG or NDEBUG
ifndef DB ifndef DB
DB = NDEBUG DB = NDEBUG
# DB = DEBUG # DB = DEBUG
endif endif
# Optimization: -O<n> or debugging: -g # Optimization: -O<n> or debugging: -g
ifeq ($(DB),NDEBUG) ifeq ($(DB),NDEBUG)
@@ -70,7 +70,7 @@ ifdef CWFolder
METROWERKS = $(CWFolder) METROWERKS = $(CWFolder)
endif endif
ifdef METROWERKS ifdef METROWERKS
# MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support # MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support
MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support/Metrowerks Support MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support/Metrowerks Support
CC = mwccnlm CC = mwccnlm
else else
@@ -137,10 +137,10 @@ ifeq ($(LIBARCH),LIBC)
PRELUDE = $(SDK_LIBC)/imports/libcpre.o PRELUDE = $(SDK_LIBC)/imports/libcpre.o
CFLAGS += -align 4 CFLAGS += -align 4
else else
# PRELUDE = $(SDK_CLIB)/imports/clibpre.o # PRELUDE = $(SDK_CLIB)/imports/clibpre.o
# to avoid the __init_* / __deinit_* whoes dont use prelude from NDK # to avoid the __init_* / __deinit_* whoes dont use prelude from NDK
PRELUDE = "$(MWCW_PATH)/libraries/runtime/prelude.obj" PRELUDE = "$(MWCW_PATH)/libraries/runtime/prelude.obj"
# CFLAGS += -include "$(MWCW_PATH)/headers/nlm_clib_prefix.h" # CFLAGS += -include "$(MWCW_PATH)/headers/nlm_clib_prefix.h"
CFLAGS += -align 1 CFLAGS += -align 1
endif endif
else else
@@ -158,7 +158,7 @@ CFLAGS += -Wall # -pedantic
ifeq ($(LIBARCH),LIBC) ifeq ($(LIBARCH),LIBC)
PRELUDE = $(SDK_LIBC)/imports/libcpre.gcc.o PRELUDE = $(SDK_LIBC)/imports/libcpre.gcc.o
else else
# PRELUDE = $(SDK_CLIB)/imports/clibpre.gcc.o # PRELUDE = $(SDK_CLIB)/imports/clibpre.gcc.o
# to avoid the __init_* / __deinit_* whoes dont use prelude from NDK # to avoid the __init_* / __deinit_* whoes dont use prelude from NDK
# http://www.gknw.net/development/mk_nlm/gcc_pre.zip # http://www.gknw.net/development/mk_nlm/gcc_pre.zip
PRELUDE = $(NDK_ROOT)/pre/prelude.o PRELUDE = $(NDK_ROOT)/pre/prelude.o
@@ -191,13 +191,13 @@ IMPORTS += GetProcessSwitchCount RunningProcess
ifeq ($(LIBARCH),LIBC) ifeq ($(LIBARCH),LIBC)
INCLUDES += -I$(SDK_LIBC)/include INCLUDES += -I$(SDK_LIBC)/include
# INCLUDES += -I$(SDK_LIBC)/include/nks # INCLUDES += -I$(SDK_LIBC)/include/nks
# INCLUDES += -I$(SDK_LIBC)/include/winsock # INCLUDES += -I$(SDK_LIBC)/include/winsock
CFLAGS += -D_POSIX_SOURCE CFLAGS += -D_POSIX_SOURCE
else else
INCLUDES += -I$(SDK_CLIB)/include/nlm INCLUDES += -I$(SDK_CLIB)/include/nlm
# INCLUDES += -I$(SDK_CLIB)/include/nlm/obsolete # INCLUDES += -I$(SDK_CLIB)/include/nlm/obsolete
# INCLUDES += -I$(SDK_CLIB)/include # INCLUDES += -I$(SDK_CLIB)/include
endif endif
CFLAGS += $(INCLUDES) CFLAGS += $(INCLUDES)

2
nw/keepscreen.c
View File

@@ -21,5 +21,3 @@ void _NonAppStop()
printf("<Press any key to close screen> "); printf("<Press any key to close screen> ");
getcharacter(); getcharacter();
} }

2
nw/nwlib.c
View File

@@ -300,5 +300,3 @@ int main ( void )
#endif /* __NOVELL_LIBC__ */ #endif /* __NOVELL_LIBC__ */
#endif /* NETWARE */ #endif /* NETWARE */

20
nw/test/GNUmakefile
View File

@@ -46,7 +46,7 @@ endif
# must be equal to DEBUG or NDEBUG # must be equal to DEBUG or NDEBUG
ifndef DB ifndef DB
DB = NDEBUG DB = NDEBUG
# DB = DEBUG # DB = DEBUG
endif endif
# Optimization: -O<n> or debugging: -g # Optimization: -O<n> or debugging: -g
ifeq ($(DB),NDEBUG) ifeq ($(DB),NDEBUG)
@@ -63,7 +63,7 @@ ifdef CWFolder
METROWERKS = $(CWFolder) METROWERKS = $(CWFolder)
endif endif
ifdef METROWERKS ifdef METROWERKS
# MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support # MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support
MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support/Metrowerks Support MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support/Metrowerks Support
CC = mwccnlm CC = mwccnlm
else else
@@ -128,10 +128,10 @@ ifeq ($(LIBARCH),LIBC)
PRELUDE = $(SDK_LIBC)/imports/libcpre.o PRELUDE = $(SDK_LIBC)/imports/libcpre.o
CFLAGS += -align 4 CFLAGS += -align 4
else else
# PRELUDE = $(SDK_CLIB)/imports/clibpre.o # PRELUDE = $(SDK_CLIB)/imports/clibpre.o
# to avoid the __init_* / __deinit_* whoes dont use prelude from NDK # to avoid the __init_* / __deinit_* whoes dont use prelude from NDK
PRELUDE = "$(MWCW_PATH)/libraries/runtime/prelude.obj" PRELUDE = "$(MWCW_PATH)/libraries/runtime/prelude.obj"
# CFLAGS += -include "$(MWCW_PATH)/headers/nlm_clib_prefix.h" # CFLAGS += -include "$(MWCW_PATH)/headers/nlm_clib_prefix.h"
CFLAGS += -align 1 CFLAGS += -align 1
endif endif
else else
@@ -147,7 +147,7 @@ CFLAGS += -Wall # -pedantic
ifeq ($(LIBARCH),LIBC) ifeq ($(LIBARCH),LIBC)
PRELUDE = $(SDK_LIBC)/imports/libcpre.gcc.o PRELUDE = $(SDK_LIBC)/imports/libcpre.gcc.o
else else
# PRELUDE = $(SDK_CLIB)/imports/clibpre.gcc.o # PRELUDE = $(SDK_CLIB)/imports/clibpre.gcc.o
# to avoid the __init_* / __deinit_* whoes dont use prelude from NDK # to avoid the __init_* / __deinit_* whoes dont use prelude from NDK
# http://www.gknw.net/development/mk_nlm/gcc_pre.zip # http://www.gknw.net/development/mk_nlm/gcc_pre.zip
PRELUDE = $(NDK_ROOT)/pre/prelude.o PRELUDE = $(NDK_ROOT)/pre/prelude.o
@@ -188,14 +188,14 @@ endif
ifeq ($(LIBARCH),LIBC) ifeq ($(LIBARCH),LIBC)
INCLUDES += -I$(SDK_LIBC)/include INCLUDES += -I$(SDK_LIBC)/include
# INCLUDES += -I$(SDK_LIBC)/include/nks # INCLUDES += -I$(SDK_LIBC)/include/nks
# INCLUDES += -I$(SDK_LIBC)/include/winsock # INCLUDES += -I$(SDK_LIBC)/include/winsock
CFLAGS += -D_POSIX_SOURCE CFLAGS += -D_POSIX_SOURCE
else else
INCLUDES += -I$(SDK_CLIB)/include/nlm INCLUDES += -I$(SDK_CLIB)/include/nlm
# INCLUDES += -I$(SDK_CLIB)/include/nlm/obsolete # INCLUDES += -I$(SDK_CLIB)/include/nlm/obsolete
# INCLUDES += -I$(SDK_CLIB)/include # INCLUDES += -I$(SDK_CLIB)/include
# CFLAGS += -DNETDB_USE_INTERNET # CFLAGS += -DNETDB_USE_INTERNET
endif endif
CFLAGS += $(INCLUDES) CFLAGS += $(INCLUDES)

3
tests/Makefile.am
View File

@@ -39,7 +39,8 @@ INTEGRATION_TESTS = \
# Enable this once the tests are working # Enable this once the tests are working
#TESTS += $(INTEGRATION_TESTS) #TESTS += $(INTEGRATION_TESTS)
check_PROGRAMS += $(INTEGRATION_TESTS) check_PROGRAMS += $(INTEGRATION_TESTS)
librunner_la_SOURCES = runner.c runner.h \ librunner_la_SOURCES = \
runner.c runner.h \
session_fixture.c session_fixture.h \ session_fixture.c session_fixture.h \
openssh_fixture.c openssh_fixture.h openssh_fixture.c openssh_fixture.h
LDADD = librunner.la LDADD = librunner.la

2
vms/libssh2_config.h
View File

@@ -8,7 +8,7 @@
#define ssize_t SSIZE_T #define ssize_t SSIZE_T
typedef unsigned int uint32_t ; typedef unsigned int uint32_t;
typedef unsigned int socklen_t; /* missing in headers on VMS */ typedef unsigned int socklen_t; /* missing in headers on VMS */
/* Have's */ /* Have's */

1
vms/libssh2_make_kit.dcl
View File

@@ -219,4 +219,3 @@ $ write pt "[gnv.common_src]libssh2_''versionname'''datename'_src.bck"
$close pt $close pt
$exit $exit
$ endsubroutine $ endsubroutine

2
vms/man2help.c
View File

@@ -512,5 +512,3 @@ free( helpfile );
return( status ); return( status );
} }

5
vms/readme.vms
View File

@@ -312,8 +312,3 @@ When you have built the shared library and the help library,
you can build a PCSI kit by issueing this command: you can build a PCSI kit by issueing this command:
@libssh2_make_kit.dcl @libssh2_make_kit.dcl