Fix build on windows

* DWORD was not found on windows
* tmp_ptr had the wrong type
* generating both libspp and spp executable in the same build dir caused
  an error because on windows both things generate a spp.lib file. To
  solve this issue, move the spp executable to a separate `bin` directory

Author: ret2libc

Makefile

@@ -3,7 +3,7 @@ include config.mk
 PWD=$(shell pwd)
 PREFIX?=/usr
 BINDIR=${DESTDIR}${PREFIX}/bin
-OBJ=spp.o main.o
+OBJ=spp.o bin/main.o
 # r_api.o
 ODF=$(subst .o,.d,$(OBJ))
 BIN=spp

main.c bin/main.c

@@ -1,7 +1,7 @@
 /* MIT pancake <[email protected]> (C) 2009-2020 */
 
-#include "spp.h"
-#include "r_api.h"
+#include "../spp.h"
+#include "../r_api.h"
 
 extern struct Proc *procs[];
 extern struct Proc *proc;

bin/meson.build

@@ -0,0 +1,4 @@
+spp_exe = executable('spp', ['main.c', '../spp.c'],
+  include_directories: ['.', '..'],
+  dependencies: spp_dep,
+  install: true)

meson.build

@@ -1,13 +1,12 @@
 project('spp', 'c')
-spp_version = '1.0.0'
+spp_version = '1.2.0'
 
 configure_file(input: 'config.def.h',
   output: 'config.h',
   copy: true)
 
 spp_files = [
   'spp.c',
-  's_api.c'
 ]
 
 libspp_static = static_library('spp', spp_files,
@@ -38,9 +37,5 @@ pkgconfig_mod.generate(libspp,
 
 if not meson.is_subproject()
   install_headers('spp.h')
-
-  spp_exe = executable('spp', ['main.c'],
-    dependencies: spp_dep,
-    install: true
-  )
+  subdir('bin')
 endif

r_api.c

@@ -1,6 +1,10 @@
 /* radare2 - LGPL - Copyright 2013-2020 - pancake */
 
+#if __UNIX__
 #include <unistd.h>
+#elif __WINDOWS__
+#include <windows.h>
+#endif
 #include "spp.h"
 #include "r_api.h"
 
@@ -117,13 +121,13 @@ int r_sys_setenv(const char *key, const char *value) {
 char *r_sys_getenv(const char *key) {
 #if __WINDOWS__
 	DWORD dwRet;
-	char *envbuf = NULL, tmp_ptr;
+	char *envbuf = NULL, *tmp_ptr;
 	char *val = NULL;
 	const int TMP_BUFSIZE = 4096;
 	if (!key) {
 		return NULL;
 	}
-	envbuf = (envbuf)malloc (sizeof (envbuf) * TMP_BUFSIZE);
+	envbuf = malloc (sizeof (envbuf) * TMP_BUFSIZE);
 	if (!envbuf) {
 		goto err_r_sys_get_env;
 	}
@@ -133,7 +137,7 @@ char *r_sys_getenv(const char *key) {
 			goto err_r_sys_get_env;
 		}
 	} else if (TMP_BUFSIZE < dwRet) {
-		tmp_ptr = (char *)realloc (envbuf, dwRet);
+		tmp_ptr = realloc (envbuf, dwRet);
 		if (!tmp_ptr) {
 			goto err_r_sys_get_env;
 		}