Martin Pluskal
f8eaef609e
- Split the library to separate subpackage as per guidelines - Update to 3.1.2 release to match fedora: * Our version was from 2001 * This version is from 2006 - Add patches from Fedora: * xbase-2.0.0-fixconfig.patch * xbase-2.0.0-fixheader.patch * xbase-2.0.0-gcc43.patch * xbase-2.0.0-ppc.patch * xbase-2.0.0-x86_64.patch * xbase-3.1.2-configure-gcc-version-fix.patch * xbase-3.1.2-fixconfig.patch * xbase-3.1.2-gcc44.patch * xbase-3.1.2-gcc47.patch * xbase-3.1.2-gcc6.patch * xbase-3.1.2-gcc7.patch * xbase-3.1.2-lesserg.patch * xbase-3.1.2-xbnode.patch - Drop no longer applicable patches: * xbase-automake-1.13.patch * xbase-2.0.0-array-del.patch * xbase-2.0.0-gcc41fix.patch * xbase-2.0.0-gcc47.patch * xbase-2.0.0-iostream_h.patch * xbase-2.0.0-makefiles.patch OBS-URL: https://build.opensuse.org/request/show/505494 OBS-URL: https://build.opensuse.org/package/show/server:database/xbase?expand=0&rev=12
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
diff -up xbase64-3.1.2/bin/dbfutil1.cpp.gcc7 xbase64-3.1.2/bin/dbfutil1.cpp
|
|
--- xbase64-3.1.2/bin/dbfutil1.cpp.gcc7 2017-02-20 09:59:36.135561103 -0500
|
|
+++ xbase64-3.1.2/bin/dbfutil1.cpp 2017-02-20 10:00:32.743218194 -0500
|
|
@@ -157,7 +157,8 @@ void MyClass::SetFilter()
|
|
memset( Expression, 0x00, 512 );
|
|
while( !strlen( Expression )){
|
|
std::cout << "Enter filter expression (like AMOUNT<5)" << std::endl;
|
|
- gets( Expression );
|
|
+ fgets( Expression, sizeof(Expression), stdin );
|
|
+ strtok( Expression, "\n" );
|
|
}
|
|
if( xbf )
|
|
delete xbf;
|
|
@@ -247,7 +248,8 @@ void MyClass::ProcessExpression()
|
|
while( !strstr( exprsn, "QUIT" ) && !strstr( exprsn, "quit" )){
|
|
|
|
std::cout << ">";
|
|
- gets( exprsn );
|
|
+ fgets( exprsn, sizeof(exprsn), stdin );
|
|
+ strtok( exprsn, "\n" );
|
|
|
|
if( strstr( exprsn, "HELP" ) || strstr( exprsn, "help" )){
|
|
std::cout << "** Command Help ***" << std::endl << std::endl;
|
|
diff -up xbase64-3.1.2/xbase64/xbase64.h.gcc7 xbase64-3.1.2/xbase64/xbase64.h
|
|
--- xbase64-3.1.2/xbase64/xbase64.h.gcc7 2017-02-20 09:49:07.063609482 -0500
|
|
+++ xbase64-3.1.2/xbase64/xbase64.h 2017-02-20 09:57:36.586618723 -0500
|
|
@@ -53,6 +53,7 @@
|
|
#endif
|
|
|
|
#include <string.h>
|
|
+#include <cstdio>
|
|
|
|
#if defined(__WIN32__)
|
|
#include "windows.h"
|