cake
/
p7utils
Archived
1
0
Fork 0
Code

New targets (all-<bin>.exe), corrected mcsfile

This commit is contained in:
Thomas Touhey 2017-01-27 21:53:34 +01:00
parent a70425725d
commit 23e4a7bd7b
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -2,6 +2,6 @@
/obj
/man
/p7*
/mcsfile
/mcsfile*
.*.swp

4
Makefile
View File

@ -149,7 +149,7 @@ $(eval $(call make-binaryobj-rule,$(bin),$(obj)))))
define make-binary-rules
$1$(if $(FOR_WINDOWS),.exe): $(SRC_$1:%=$(OBJDIR)/$1/%.o) | $(OBJDIR)/$1
$(call bcmd,ld,$$@,$(LD) -o $$@ $$^ $(LDFLAGS_$1))
all-$1: $(CHECKCFG) $1$(if $(FOR_WINDOWS),.exe) all-doc-$1
all-$1 all-$1.exe: $(CHECKCFG) $1$(if $(FOR_WINDOWS),.exe) all-doc-$1
clean-$1:
$(call rmsg,Removing $1 and its objects directory.)
@ -196,7 +196,7 @@ $(eval $(call make-installbinary-rule,$(bin))))
.PHONY: all-bins mostlyclean-bins mclean-bins clean-bins re-bins
.PHONY: install-bins uninstall-bins
.PHONY: $(foreach b,$(BINARIES),all-$(b) clean-$(b) re-$(b) \
.PHONY: $(foreach b,$(BINARIES),all-$(b) all-$(b).exe clean-$(b) re-$(b) \
install-$(b) uninstall-$(b))
#******************************************************************************#
# Documentation-related #

10
src/mcsfile/main.h
View File

@ -11,6 +11,16 @@
# define MAIN_H
# include <libg1m.h>
/* Some printf types */
# ifdef _WIN64
# define PRIuSIZE "l64u"
# elif _WIN32
# define PRIuSIZE "u"
# else
# define PRIuSIZE "zu"
# endif
/* Prototypes */
int parse_args(int ac, char **av, const char **paths);
void put_files(g1m_t *handle);

2
src/mcsfile/print.c
View File

@ -60,7 +60,7 @@ static void sort_files(g1m_t *handle)
static void put_description(g1m_mcsfile_t *file)
{
if (!file->type)
printf("unknown content (%zu octets)\n", file->content_size);
printf("unknown content (%" PRIuSIZE" octets)\n", file->content_size);
else if (file->type & g1m_mcstype_program) {
printf("program (");
if (g1m_has_password(file)) printf("password: '%s')\n", file->password);