#include <mach-o/dyld.h>
#endif
+#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
+
+#define LOG_STRERROR_FILE(kind,syscall,filename) GNUNET_log_from_strerror_file (kind, "util", syscall, filename)
+
#if LINUX
/**
* Try to determine path by reading /proc/PID/exe
size = readlink (fn, lnk, sizeof (lnk) - 1);
if (size <= 0)
{
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "readlink", fn);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_ERROR, "readlink", fn);
return NULL;
}
GNUNET_assert (size < sizeof (lnk));
path = _dyld_get_image_name (i);
if (path != NULL && strlen (path) > 0)
{
- p = strdup (path);
+ p = GNUNET_strdup (path);
s = p + strlen (p);
while ((s > p) && (*s != '/'))
s--;
return NULL;
}
-/*
+/**
* @brief get the path to GNUnet bin/ or lib/, prefering the lib/ path
* @author Milan
*
if (ret != NULL)
return ret;
/* other attempts here */
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _
- ("Could not determine installation path for %s. Set `%s' environment variable.\n"),
- "GNUnet", "GNUNET_PREFIX");
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _
+ ("Could not determine installation path for %s. Set `%s' environment variable.\n"),
+ "GNUnet", "GNUNET_PREFIX");
return NULL;
}
#endif
if (p == NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Could not find binary `%s' in PATH!\n"), binary);
+ LOG (GNUNET_ERROR_TYPE_INFO, _("Could not find binary `%s' in PATH!\n"),
+ binary);
return GNUNET_SYSERR;
}
if (0 != STAT (p, &statbuf))
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _("stat (%s) failed: %s\n"), p,
- STRERROR (errno));
+ LOG (GNUNET_ERROR_TYPE_WARNING, _("stat (%s) failed: %s\n"), p,
+ STRERROR (errno));
GNUNET_free (p);
return GNUNET_SYSERR;
}
{
DWORD err = GetLastError ();
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "socket (AF_INET, SOCK_RAW, IPPROTO_ICMP) failed! GLE = %d\n",
- err);
+ LOG (GNUNET_ERROR_TYPE_INFO,
+ "socket (AF_INET, SOCK_RAW, IPPROTO_ICMP) failed! GLE = %d\n", err);
return GNUNET_NO; /* not running as administrator */
}
closesocket (rawsock);