baco/ft_printf
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix return code of main and avoid rebase in make sync

Browse Source
This commit is contained in:
gbaconni
2022-04-24 11:26:03 +02:00
parent 6e6caf30f1
commit b7643860ef
3 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
Makefile
View File

@@ -6,7 +6,7 @@
# By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ # # By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2022/01/18 15:11:16 by gbaconni #+# #+# # # Created: 2022/01/18 15:11:16 by gbaconni #+# #+# #
# Updated: 2022/04/23 21:57:08 by gbaconni ### lausanne.ch # # Updated: 2022/04/24 11:24:37 by gbaconni ### lausanne.ch #
# # # #
# **************************************************************************** # # **************************************************************************** #
# #
@@ -87,20 +87,20 @@ fast:
@$(MAKE) -C $(LIBFTPRINTF) re FAST=1 @$(MAKE) -C $(LIBFTPRINTF) re FAST=1
test: clean $(NAME) test: clean $(NAME)
@$(PREFIX) ./$(NAME) "%c" C || true @$(PREFIX) ./$(NAME) "%c" C
@$(PREFIX) ./$(NAME) "%s" "42 Lausanne" || true @$(PREFIX) ./$(NAME) "%s" "42 Lausanne"
@$(PREFIX) ./$(NAME) "%d" 42 || true @$(PREFIX) ./$(NAME) "%d" 42
@$(PREFIX) ./$(NAME) "%i" 2147483647 || true @$(PREFIX) ./$(NAME) "%i" 2147483647
@$(PREFIX) ./$(NAME) "%i" -2147483646 || true @$(PREFIX) ./$(NAME) "%i" -2147483646
@$(PREFIX) ./$(NAME) "%u" 4294967295 || true @$(PREFIX) ./$(NAME) "%u" 4294967295
@$(PREFIX) ./$(NAME) "%x" 42 || true @$(PREFIX) ./$(NAME) "%x" 42
@$(PREFIX) ./$(NAME) "%X" 42 || true @$(PREFIX) ./$(NAME) "%X" 42
@$(PREFIX) ./$(NAME) "%%" "" || true @$(PREFIX) ./$(NAME) "%%" ""
@$(PREFIX) ./$(NAME) "%p" "" || true @$(PREFIX) ./$(NAME) "%p" ""
@$(PREFIX) ./$(NAME) "%p" "\n" || true @$(PREFIX) ./$(NAME) "%p" "\n"
@$(PREFIX) ./$(NAME) "Forty Two" "" || true @$(PREFIX) ./$(NAME) "Forty Two" ""
@$(PREFIX) ./$(NAME) "\t\r\n" "" || true @$(PREFIX) ./$(NAME) "\t\r\n" ""
@$(PREFIX) ./$(NAME) "%1d" 42 || true @$(PREFIX) ./$(NAME) "%1d" 42
test2: leak test2: leak
@$(MAKE) test LEAK=1 @$(MAKE) test LEAK=1
@@ -112,29 +112,36 @@ test4: fast
@$(MAKE) test FAST=1 @$(MAKE) test FAST=1
test42: clean $(NAME) test42: clean $(NAME)
@$(PREFIX) ./$(NAME) "Hello World %% %44s %d %c %x %p" "Lausanne" 42 C 66 "C" || true @$(PREFIX) ./$(NAME) "Hello World %% %44s %d %c %x %p" "Lausanne" 42 C 66 "C"
@$(PREFIX) ./$(NAME) "Characters: %c %c \n" 'a' 65
@$(PREFIX) ./$(NAME) "Decimals: %d %ld\n" 1977 650000L
@$(PREFIX) ./$(NAME) "Preceding with blanks: %10d \n" 1977
@$(PREFIX) ./$(NAME) "Preceding with zeros: %010d \n" 1977
@$(PREFIX) ./$(NAME) "Some different radices: %d %x %o %#x %#o \n" 100 100 100 100 100
@$(PREFIX) ./$(NAME) "floats: %4.2f %+.0e %E \n" 3.1416 3.1416 3.1416
@$(PREFIX) ./$(NAME) "Width trick: %*d \n" 5 10
@$(PREFIX) ./$(NAME) "%s \n" "A string"
doc: doc:
@curl -s -L -z fr.subject.pdf -o fr.subject.pdf $(PDF_FR) @curl -s -L -z fr.subject.pdf -o fr.subject.pdf $(PDF_FR)
@curl -s -L -z en.subject.pdf -o en.subject.pdf $(PDF_EN) @curl -s -L -z en.subject.pdf -o en.subject.pdf $(PDF_EN)
update: config online fetch update: config online pull
sync: config online fetch sync: config online pull
@git status | grep -q 'nothing to commit' || (git diff; read -p "Comment: " comment; git add -A; git commit -am "$${comment-$$(date '+%F %T')}"; git push) @git status | grep -q 'nothing to commit' || (git diff; read -p "Comment: " comment; git add -A; git commit -am "$${comment-$$(date '+%F %T')}"; git push)
online: online:
@dig +short vogsphere.baco.net A | grep -qF '213.5.156.25' || echo 'vogsphere.baco.net unresolvable' @dig +short vogsphere.baco.net A | grep -qF '213.5.156.25' || echo 'vogsphere.baco.net unresolvable'
@nc -vzw3 vogsphere.baco.net 443 2>&1 | grep -qF 'succeeded' || echo 'vogsphere.baco.net unreachable' @nc -vzw3 vogsphere.baco.net 443 2>&1 | grep -qF '213.5.156.25' || echo 'vogsphere.baco.net unreachable'
fetch: pull:
@git fetch @git pull
config: config:
@git config user.name "gbaconni" @git config user.name "gbaconni"
@git config user.email "gbaconni@student.42lausanne.ch" @git config user.email "gbaconni@student.42lausanne.ch"
@git config pull.rebase true @git config pull.rebase false
@git config branch.autosetuprebase always
42: 42:
@git clone $(GIT_REPO) 42 || true @git clone $(GIT_REPO) 42 || true

13
libftprintf/Makefile
View File

@@ -6,7 +6,7 @@
# By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ # # By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2022/01/18 15:11:16 by gbaconni #+# #+# # # Created: 2022/01/18 15:11:16 by gbaconni #+# #+# #
# Updated: 2022/04/23 23:52:03 by gbaconni ### lausanne.ch # # Updated: 2022/04/24 11:25:04 by gbaconni ### lausanne.ch #
# # # #
# **************************************************************************** # # **************************************************************************** #
# #
@@ -142,19 +142,18 @@ ft:
@echo "functions:" @echo "functions:"
@nm $(NAME) | grep T | grep -o 'ft_.*' | sort -u @nm $(NAME) | grep T | grep -o 'ft_.*' | sort -u
sync: config online fetch sync: config online pull
@git status | grep -q 'nothing to commit' || (git diff; read -p "Comment: " comment; git add -A; git commit -am "$${comment-$$(date '+%F %T')}"; git push) @git status | grep -q 'nothing to commit' || (git diff; read -p "Comment: " comment; git add -A; git commit -am "$${comment-$$(date '+%F %T')}"; git push)
online: online:
@dig +short vogsphere.42lausanne.ch A | grep -qF '185.25.195.180' || echo 'vogsphere.42lausanne.ch unresolvable' @dig +short vogsphere.42lausanne.ch A | grep -qF '185.25.195.180' || echo 'vogsphere.42lausanne.ch unresolvable'
@nc -vzw3 vogsphere.42lausanne.ch 443 2>&1 | grep -qF 'succeeded' || echo 'vogsphere.42lausanne.ch unreachable' @nc -vzw3 vogsphere.42lausanne.ch 443 2>&1 | grep -qF '185.25.195.180' || echo 'vogsphere.42lausanne.ch unreachable'
fetch: pull:
@git fetch @git pull
config: config:
@git config user.name "gbaconni" @git config user.name "gbaconni"
@git config user.email "gbaconni@student.42lausanne.ch" @git config user.email "gbaconni@student.42lausanne.ch"
@git config pull.rebase true @git config pull.rebase false
@git config branch.autosetuprebase always

10
main.c
View File

@@ -6,7 +6,7 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/04/13 06:58:46 by gbaconni #+# #+# */ /* Created: 2022/04/13 06:58:46 by gbaconni #+# #+# */
/* Updated: 2022/04/24 00:21:23 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/24 11:14:40 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -105,15 +105,17 @@ int assert_printf(char *format, char *arg)
printf("%d = ft_printf(\"%s\", '%s')\n%s\n\n", ft_ret, format, arg, ft_out); printf("%d = ft_printf(\"%s\", '%s')\n%s\n\n", ft_ret, format, arg, ft_out);
assert(ret == ft_ret); assert(ret == ft_ret);
assert(strcmp(out, ft_out) == 0); assert(strcmp(out, ft_out) == 0);
return (ret); return (!(ret == ft_ret));
} }
int main(int args, char *argv[]) int main(int args, char *argv[])
{ {
int ret;
char *fmt; char *fmt;
char *format; char *format;
char *arg; char *arg;
ret = 0;
argv++; argv++;
if (--args < 1) if (--args < 1)
return (127); return (127);
@@ -125,9 +127,9 @@ int main(int args, char *argv[])
arg = *argv++; arg = *argv++;
else else
arg = NULL; arg = NULL;
assert_printf(format, arg); ret |= assert_printf(format, arg);
free(format); free(format);
format = ft_fmtsplit(&fmt); format = ft_fmtsplit(&fmt);
} }
return (0); return (ret);
} }