mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix(?) Linux compile errors

Browse source 
modified:   storage/connect/tabrest.cpp
  modified:   storage/connect/CMakeLists.txt

-fix MDEV-24794
 modified:   storage/connect/valblk.h
This commit is contained in:
Olivier Bertrand 2021-04-06 00:10:07 +02:00
parent 2aefe0bee1
commit 28b76afcea
3 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
storage/connect/CMakeLists.txt
View file

@ -354,6 +354,9 @@ IF(CONNECT_WITH_REST)
##ELSE(NOT cpprestsdk_FOUND)
## MESSAGE(STATUS "=====> cpprestsdk package not found")
# ENDIF (cpprestsdk_FOUND)
IF(UNIX)
SET(REST_LIBRARY -lexplain)
ENDIF(UNIX)
ENDIF(CONNECT_WITH_REST)
#

30
storage/connect/tabrest.cpp
View file

@ -24,6 +24,10 @@
#else // !__WIN__
#define __stdcall
#include <dlfcn.h> // dlopen(), dlclose(), dlsym() ...
#include <sys/types.h>
#include <unistd.h>
#include "stdio.h"
#include <sys/wait.h>
#include <libexplain/execlp.h>
#endif // !__WIN__
#endif // !REST_SOURCE
@ -98,18 +102,6 @@ int Xcurl(PGLOBAL g, PCSZ Http, PCSZ Uri, PCSZ filename)
int rc = 0;
FILE *pipe;
if ((pipe = popen("curl --version", "r"))) {
if (trace(515))
while (fgets(buf, sizeof(buf), pipe)) {
htrc("%s", buf);
} // endwhile
pclose(pipe);
} else {
sprintf(g->Message, "curl not available, errno=%d", errno);
return 1;
} // endif pipe
if (strchr(filename, '"')) {
strcpy(g->Message, "Invalid file name");
return 1;
@ -149,15 +141,25 @@ int Xcurl(PGLOBAL g, PCSZ Http, PCSZ Uri, PCSZ filename)
} // endif CreateProcess
#else // !__WIN__
char fn[600];
pid_t pID = vfork();
pid_t pID;
// Check if curl package is availabe by executing subprocess
FILE *f= popen("command -v curl", "r");
if (!f) {
strcpy(g->Message, "curl CLI not installed");
return 1;
} else
close(f);
pID = vfork();
sprintf(fn, "-o%s", filename);
if (pID == 0) {
// Code executed by child process
execlp("curl", "curl", buf, fn, (char*)NULL);
// If execlp() is successful, we should not reach this next line.
strcpy(g->Message, explain_execlp());
strcpy(g->Message, explain_execlp("curl", "curl", buf, fn, (char*)NULL)));
rc = 1;
exit(rc);
} // endif execlp

2
storage/connect/valblk.h
View file

@ -69,7 +69,7 @@ class VALBLK : public BLOCK {
int GetPrec(void) {return Prec;}
void SetCheck(bool b) {Check = b;}
void MoveNull(int i, int j)
{if (To_Nulls) To_Nulls[j] = To_Nulls[j];}
{if (To_Nulls) To_Nulls[j] = To_Nulls[i];}
virtual void SetNull(int n, bool b)
{if (To_Nulls) {To_Nulls[n] = (b) ? '*' : 0;}}
virtual bool IsNull(int n) {return To_Nulls && To_Nulls[n];}