Here are some patches to make synce-librapi2 build correctly on FreeBSD 7.0. Almost all of them replace "devname" variable name with "dev_name", because "devname" is used in stdlib.h. Please rename these variables :-(
Also I supply FDI file for invoking connection procedure. Also soon I'll post corrected hal-synce-legacy script :-) -- Bakulin Ilya <[EMAIL PROTECTED]>
10-synce.fdi
Description: Binary data
--- tools/oidinfo.c.000 2008-01-07 15:17:39.000000000 +0300
+++ tools/oidinfo.c 2008-02-25 16:14:26.000000000 +0300
@@ -6,7 +6,7 @@
#include <string.h>
#include <unistd.h>
-char* devname = NULL;
+char* dev_name = NULL;
static void show_usage(const char* name)
{
@@ -40,7 +40,7 @@
break;
case 'p':
- devname = optarg;
+ dev_name = optarg;
break;
case 'h':
@@ -75,11 +75,11 @@
if (!handle_parameters(argc, argv, &oid))
goto exit;
- if ((connection = rapi_connection_from_name(devname)) == NULL)
+ if ((connection = rapi_connection_from_name(dev_name)) == NULL)
{
fprintf(stderr, "%s: Could not find configuration at path '%s'\n",
argv[0],
- devname?devname:"(Default)");
+ dev_name?dev_name:"(Default)");
goto exit;
}
rapi_connection_select(connection);
--- tools/pcp.c.000 2008-02-25 15:58:27.000000000 +0300
+++ tools/pcp.c 2008-02-25 16:00:32.000000000 +0300
@@ -7,7 +7,7 @@
#include <string.h>
#include <unistd.h>
-char* devname = NULL;
+char* dev_name = NULL;
static void show_usage(const char* name)
{
@@ -43,7 +43,7 @@
break;
case 'p':
- devname = optarg;
+ dev_name = optarg;
break;
case 'h':
@@ -169,11 +169,11 @@
if (!handle_parameters(argc, argv, &source, &dest))
goto exit;
- if ((connection = rapi_connection_from_name(devname)) == NULL)
+ if ((connection = rapi_connection_from_name(dev_name)) == NULL)
{
fprintf(stderr, "%s: Could not find configuration at path '%s'\n",
argv[0],
- devname?devname:"(Default)");
+ dev_name?dev_name:"(Default)");
goto exit;
}
rapi_connection_select(connection);
--- tools/pkillall.c.000 2008-01-07 15:17:39.000000000 +0300
+++ tools/pkillall.c 2008-02-25 16:13:12.000000000 +0300
@@ -6,7 +6,7 @@
#include <unistd.h>
#include <getopt.h>
-char* devname = NULL;
+char* dev_name = NULL;
static void show_usage(const char* name)
{
@@ -39,7 +39,7 @@
break;
case 'p':
- devname = optarg;
+ dev_name = optarg;
break;
case 'h':
@@ -63,11 +63,11 @@
if (!handle_parameters(argc, argv))
goto exit;
- if ((connection = rapi_connection_from_name(devname)) == NULL)
+ if ((connection = rapi_connection_from_name(dev_name)) == NULL)
{
fprintf(stderr, "%s: Could not find configuration at path '%s'\n",
argv[0],
- devname?devname:"(Default)");
+ dev_name?dev_name:"(Default)");
goto exit;
}
rapi_connection_select(connection);
--- tools/pls.c.000 2008-01-07 15:17:39.000000000 +0300
+++ tools/pls.c 2008-02-25 16:00:41.000000000 +0300
@@ -7,7 +7,7 @@
#include <string.h>
#include <unistd.h>
-char* devname = NULL;
+char* dev_name = NULL;
static bool numeric_file_attributes = false;
static bool show_hidden_files = false;
@@ -46,7 +46,7 @@
break;
case 'p':
- devname = optarg;
+ dev_name = optarg;
break;
case 'd':
@@ -238,11 +238,11 @@
if (!handle_parameters(argc, argv, &path))
goto exit;
- if ((connection = rapi_connection_from_name(devname)) == NULL)
+ if ((connection = rapi_connection_from_name(dev_name)) == NULL)
{
fprintf(stderr, "%s: Could not find configuration at path '%s'\n",
argv[0],
- devname?devname:"(Default)");
+ dev_name?dev_name:"(Default)");
goto exit;
}
rapi_connection_select(connection);
--- tools/pmkdir.c.000 2008-01-07 15:17:39.000000000 +0300
+++ tools/pmkdir.c 2008-02-25 16:02:36.000000000 +0300
@@ -7,7 +7,7 @@
#include <string.h>
#include <unistd.h>
-char* devname = NULL;
+char* dev_name = NULL;
static void show_usage(const char* name)
{
@@ -41,7 +41,7 @@
break;
case 'p':
- devname = optarg;
+ dev_name = optarg;
break;
case 'h':
@@ -77,11 +77,11 @@
if (!handle_parameters(argc, argv, &path))
goto exit;
- if ((connection = rapi_connection_from_name(devname)) == NULL)
+ if ((connection = rapi_connection_from_name(dev_name)) == NULL)
{
fprintf(stderr, "%s: Could not find configuration at path '%s'\n",
argv[0],
- devname?devname:"(Default)");
+ dev_name?dev_name:"(Default)");
goto exit;
}
rapi_connection_select(connection);
--- tools/pmv.c.000 2008-01-07 15:17:39.000000000 +0300
+++ tools/pmv.c 2008-02-25 16:03:47.000000000 +0300
@@ -7,7 +7,7 @@
#include <string.h>
#include <unistd.h>
-char* devname = NULL;
+char* dev_name = NULL;
static void show_usage(const char* name)
{
@@ -42,7 +42,7 @@
break;
case 'p':
- devname = optarg;
+ dev_name = optarg;
break;
case 'h':
@@ -80,11 +80,11 @@
if (!handle_parameters(argc, argv, &source, &dest))
goto exit;
- if ((connection = rapi_connection_from_name(devname)) == NULL)
+ if ((connection = rapi_connection_from_name(dev_name)) == NULL)
{
fprintf(stderr, "%s: Could not find configuration at path '%s'\n",
argv[0],
- devname?devname:"(Default)");
+ dev_name?dev_name:"(Default)");
goto exit;
}
rapi_connection_select(connection);
--- tools/prm.c.000 2008-01-07 15:17:39.000000000 +0300
+++ tools/prm.c 2008-02-25 16:04:30.000000000 +0300
@@ -7,7 +7,7 @@
#include <string.h>
#include <unistd.h>
-char* devname = NULL;
+char* dev_name = NULL;
static void show_usage(const char* name)
{
@@ -41,7 +41,7 @@
break;
case 'p':
- devname = optarg;
+ dev_name = optarg;
break;
case 'h':
@@ -77,11 +77,11 @@
if (!handle_parameters(argc, argv, &path))
goto exit;
- if ((connection = rapi_connection_from_name(devname)) == NULL)
+ if ((connection = rapi_connection_from_name(dev_name)) == NULL)
{
fprintf(stderr, "%s: Could not find configuration at path '%s'\n",
argv[0],
- devname?devname:"(Default)");
+ dev_name?dev_name:"(Default)");
goto exit;
}
rapi_connection_select(connection);
--- tools/prmdir.c.000 2008-01-07 15:17:39.000000000 +0300
+++ tools/prmdir.c 2008-02-25 16:05:24.000000000 +0300
@@ -7,7 +7,7 @@
#include <string.h>
#include <unistd.h>
-char* devname = NULL;
+char* dev_name = NULL;
static void show_usage(const char* name)
{
@@ -41,7 +41,7 @@
break;
case 'p':
- devname = optarg;
+ dev_name = optarg;
break;
case 'h':
@@ -77,11 +77,11 @@
if (!handle_parameters(argc, argv, &path))
goto exit;
- if ((connection = rapi_connection_from_name(devname)) == NULL)
+ if ((connection = rapi_connection_from_name(dev_name)) == NULL)
{
fprintf(stderr, "%s: Could not find configuration at path '%s'\n",
argv[0],
- devname?devname:"(Default)");
+ dev_name?dev_name:"(Default)");
goto exit;
}
rapi_connection_select(connection);
--- tools/prun.c.000 2008-01-07 15:17:39.000000000 +0300
+++ tools/prun.c 2008-02-25 16:11:56.000000000 +0300
@@ -7,7 +7,7 @@
#include <string.h>
#include <unistd.h>
-char* devname = NULL;
+char* dev_name = NULL;
static void show_usage(const char* name)
{
@@ -43,7 +43,7 @@
break;
case 'p':
- devname = optarg;
+ dev_name = optarg;
break;
case 'h':
@@ -84,11 +84,11 @@
if (!handle_parameters(argc, argv, &program, ¶meters))
goto exit;
- if ((connection = rapi_connection_from_name(devname)) == NULL)
+ if ((connection = rapi_connection_from_name(dev_name)) == NULL)
{
fprintf(stderr, "%s: Could not find configuration at path '%s'\n",
argv[0],
- devname?devname:"(Default)");
+ dev_name?dev_name:"(Default)");
goto exit;
}
rapi_connection_select(connection);
--- tools/psettime.c.000 2008-01-07 15:17:39.000000000 +0300
+++ tools/psettime.c 2008-02-25 16:13:39.000000000 +0300
@@ -6,7 +6,7 @@
#include <unistd.h>
#include <getopt.h>
-char* devname = NULL;
+char* dev_name = NULL;
static void show_usage(const char* name)
{
@@ -39,7 +39,7 @@
break;
case 'p':
- devname = optarg;
+ dev_name = optarg;
break;
case 'h':
@@ -63,11 +63,11 @@
if (!handle_parameters(argc, argv))
goto exit;
- if ((connection = rapi_connection_from_name(devname)) == NULL)
+ if ((connection = rapi_connection_from_name(dev_name)) == NULL)
{
fprintf(stderr, "%s: Could not find configuration at path '%s'\n",
argv[0],
- devname?devname:"(Default)");
+ dev_name?dev_name:"(Default)");
goto exit;
}
rapi_connection_select(connection);
--- tools/pshortcut.c.000 2008-02-25 15:58:27.000000000 +0300
+++ tools/pshortcut.c 2008-02-25 16:13:25.000000000 +0300
@@ -7,7 +7,7 @@
#include <unistd.h>
#include <getopt.h>
-char* devname = NULL;
+char* dev_name = NULL;
static void show_usage(const char* name)
{
@@ -42,7 +42,7 @@
break;
case 'p':
- devname = optarg;
+ dev_name = optarg;
break;
case 'h':
@@ -82,11 +82,11 @@
if (!handle_parameters(argc, argv, &shortcut, &target))
goto exit;
- if ((connection = rapi_connection_from_name(devname)) == NULL)
+ if ((connection = rapi_connection_from_name(dev_name)) == NULL)
{
fprintf(stderr, "%s: Could not find configuration at path '%s'\n",
argv[0],
- devname?devname:"(Default)");
+ dev_name?dev_name:"(Default)");
goto exit;
}
rapi_connection_select(connection);
--- tools/pstatus.c.000 2008-01-07 15:17:39.000000000 +0300
+++ tools/pstatus.c 2008-02-25 16:12:23.000000000 +0300
@@ -6,7 +6,7 @@
#include <string.h>
#include <unistd.h>
-char* devname = NULL;
+char* dev_name = NULL;
static void show_usage(const char* name)
{
@@ -39,7 +39,7 @@
break;
case 'p':
- devname = optarg;
+ dev_name = optarg;
break;
case 'h':
@@ -221,11 +221,11 @@
if (!handle_parameters(argc, argv))
goto exit;
- if ((connection = rapi_connection_from_name(devname)) == NULL)
+ if ((connection = rapi_connection_from_name(dev_name)) == NULL)
{
fprintf(stderr, "%s: Could not find configuration at path '%s'\n",
argv[0],
- devname?devname:"(Default)");
+ dev_name?dev_name:"(Default)");
goto exit;
}
rapi_connection_select(connection);
--- invoke.c.orig 2008-03-19 11:53:11.000000000 +0300 +++ invoke.c 2008-03-19 18:42:39.000000000 +0300 @@ -1,6 +1,9 @@ /* $Id: invoke.c 2355 2006-04-07 18:47:20Z voc $ */ #include "rapi_api.h" #include "rapi_context.h" +#ifdef __FreeBSD__ +#include <sys/socket.h> +#endif #include <assert.h> #include <stdlib.h>
--- tools/rapiconfig.c.000 2008-01-07 15:17:39.000000000 +0300
+++ tools/rapiconfig.c 2008-02-25 16:12:52.000000000 +0300
@@ -8,7 +8,7 @@
#include <string.h>
#include <unistd.h>
-char* devname = NULL;
+char* dev_name = NULL;
static void show_usage(const char* name)
{
@@ -46,7 +46,7 @@
break;
case 'P':
- devname = optarg;
+ dev_name = optarg;
break;
case 'h':
@@ -172,11 +172,11 @@
Do the bossanova
*/
- if ((connection = rapi_connection_from_name(devname)) == NULL)
+ if ((connection = rapi_connection_from_name(dev_name)) == NULL)
{
fprintf(stderr, "%s: Could not find configuration at path '%s'\n",
argv[0],
- devname?devname:"(Default)");
+ dev_name?dev_name:"(Default)");
goto exit;
}
rapi_connection_select(connection);
--- tools/synce-list-programs.c.000 2008-01-07 15:17:39.000000000 +0300
+++ tools/synce-list-programs.c 2008-02-25 16:13:56.000000000 +0300
@@ -6,7 +6,7 @@
#include <string.h>
#include <unistd.h>
-char* devname = NULL;
+char* dev_name = NULL;
static void show_usage(const char* name)
{
@@ -39,7 +39,7 @@
break;
case 'p':
- devname = optarg;
+ dev_name = optarg;
break;
case 'h':
@@ -69,11 +69,11 @@
if (!handle_parameters(argc, argv))
goto exit;
- if ((connection = rapi_connection_from_name(devname)) == NULL)
+ if ((connection = rapi_connection_from_name(dev_name)) == NULL)
{
fprintf(stderr, "%s: Could not find configuration at path '%s'\n",
argv[0],
- devname?devname:"(Default)");
+ dev_name?dev_name:"(Default)");
goto exit;
}
rapi_connection_select(connection);
--- tools/synce-registry.c.000 2008-01-07 15:17:39.000000000 +0300
+++ tools/synce-registry.c 2008-02-25 16:14:10.000000000 +0300
@@ -16,7 +16,7 @@
#define ACTION_DUMP_REGISTRY 6
-char* devname = NULL;
+char* dev_name = NULL;
int action = ACTION_READVAL;
bool list_recurse = false ;
DWORD valType = REG_SZ;
@@ -114,7 +114,7 @@
list_recurse = true ;
break ;
case 'p':
- devname = optarg;
+ dev_name = optarg;
break;
case 'r':
@@ -597,11 +597,11 @@
//Add this before anything, since we don't need the
//parent_str etc..
if (action==ACTION_DUMP_REGISTRY){
- if ((connection = rapi_connection_from_name(devname)) == NULL)
+ if ((connection = rapi_connection_from_name(dev_name)) == NULL)
{
fprintf(stderr, "%s: Could not find configuration at path '%s'\n",
argv[0],
- devname?devname:"(Default)");
+ dev_name?dev_name:"(Default)");
goto exit;
}
rapi_connection_select(connection);
@@ -646,11 +646,11 @@
goto exit;
}
- if ((connection = rapi_connection_from_name(devname)) == NULL)
+ if ((connection = rapi_connection_from_name(dev_name)) == NULL)
{
fprintf(stderr, "%s: Could not find configuration at path '%s'\n",
argv[0],
- devname?devname:"(Default)");
+ dev_name?dev_name:"(Default)");
goto exit;
}
rapi_connection_select(connection);
------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________ SynCE-Devel mailing list SynCE-Devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/synce-devel
