Browse Source

ccan: update so we get exposed path constants.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
ppa-0.6.1
Rusty Russell 7 years ago
committed by Christian Decker
parent
commit
ccd0e5db54
  1. 2
      ccan/README
  2. 3
      ccan/ccan/tal/path/path.c
  3. 4
      ccan/ccan/tal/path/path.h
  4. 4
      lightningd/lightningd.c

2
ccan/README

@ -1,3 +1,3 @@
CCAN imported from http://ccodearchive.net.
CCAN version: init-2401-ge2d15a2b
CCAN version: init-2402-gec1f7161

3
ccan/ccan/tal/path/path.c

@ -11,9 +11,6 @@
#include <errno.h>
#include <assert.h>
#define PATH_SEP_STR "/"
#define PATH_SEP (PATH_SEP_STR[0])
char *path_cwd(const tal_t *ctx)
{
size_t len = 64;

4
ccan/ccan/tal/path/path.h

@ -165,4 +165,8 @@ char **path_split(const tal_t *ctx, const char *path TAKES);
*/
size_t path_ext_off(const char *path);
/* Separator constants */
#define PATH_SEP_STR "/"
#define PATH_SEP (PATH_SEP_STR[0])
#endif /* CCAN_PATH_H */

4
lightningd/lightningd.c

@ -128,10 +128,6 @@ static const char *find_my_path(const tal_t *ctx, const char *argv0)
{
char *me, *tmpctx = tal_tmpctx(ctx);
/* FIXME: Expose in CCAN! */
#define PATH_SEP_STR "/"
#define PATH_SEP (PATH_SEP_STR[0])
if (strchr(argv0, PATH_SEP)) {
const char *path;
/* Absolute paths are easy. */

Loading…
Cancel
Save