From a0007a9a3cedf9e9debec8fd034071fa9d8db9c4 Mon Sep 17 00:00:00 2001 From: nick black Date: Wed, 4 Aug 2021 02:36:10 -0400 Subject: [PATCH] add u7/cnorm/civis to windows --- CMakeLists.txt | 2 +- src/fetch/main.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 976c15d6c..1c70265c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -605,7 +605,7 @@ file(GLOB MANSOURCE3 CONFIGURE_DEPENDS doc/man/man3/*.md) # all further binaries require multimedia support if(${USE_MULTIMEDIA} STREQUAL "none" OR WIN32) list(FILTER MANSOURCE1 EXCLUDE REGEX "ncls.1.md") - list(FILTER MANSOURCE1 EXCLUDE REGEX "ncplayer.1.md") + #list(FILTER MANSOURCE1 EXCLUDE REGEX "ncplayer.1.md") else() ############################################################################ # ncls diff --git a/src/fetch/main.c b/src/fetch/main.c index 21bea5a5e..bd7ac98a5 100644 --- a/src/fetch/main.c +++ b/src/fetch/main.c @@ -307,7 +307,7 @@ getlocalhostname(fetched_info* fi){ } return -1; } -#else +#else // windows static int getusername(fetched_info* fi){ DWORD unlen = UNLEN + 1; @@ -326,7 +326,8 @@ getusername(fetched_info* fi){ static int getlocalhostname(fetched_info* fi){ char lp[MAX_COMPUTERNAME_LENGTH + 1]; - if(GetComputerNameA(lp, sizeof(lp))){ + size_t s = sizeof(lp); + if(GetComputerNameA(lp, &s)){ if( (fi->hostname = strdup(lp)) ){ return 0; }