diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 4 | ||||
| -rw-r--r-- | tools/plistutil.c | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 9f3214d..5883286 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,3 +1,5 @@ +if BUILD_TOOLS + AM_CFLAGS = \ $(GLOBAL_CFLAGS) \ -I$(top_srcdir)/include @@ -8,3 +10,5 @@ bin_PROGRAMS = plistutil plistutil_SOURCES = plistutil.c plistutil_LDADD = $(top_builddir)/src/libplist-2.0.la + +endif diff --git a/tools/plistutil.c b/tools/plistutil.c index 8121a7d..7e4eb67 100644 --- a/tools/plistutil.c +++ b/tools/plistutil.c @@ -32,10 +32,13 @@ #include <string.h> #include <sys/stat.h> #include <errno.h> +#ifndef _MSC_VER #include <unistd.h> +#endif #ifdef _MSC_VER #pragma warning(disable:4996) +#define STDIN_FILENO _fileno(stdin) #endif typedef struct _options @@ -170,7 +173,7 @@ static options_t *parse_arguments(int argc, char *argv[]) } else if (!strcmp(argv[i], "--version") || !strcmp(argv[i], "-v")) { - printf("plistutil %s\n", PACKAGE_VERSION); + printf("plistutil %s\n", libplist_version()); exit(EXIT_SUCCESS); } else @@ -193,8 +196,8 @@ int main(int argc, char *argv[]) plist_t root_node = NULL; char *plist_out = NULL; uint32_t size = 0; - int read_size = 0; - int read_capacity = 4096; + size_t read_size = 0; + size_t read_capacity = 4096; char *plist_entire = NULL; struct stat filestats; options_t *options = parse_arguments(argc, argv); |