diff --git a/ex00/ft_strcpy.c b/ex00/ft_strcpy.c index 8bc75b1..ee9a644 100644 --- a/ex00/ft_strcpy.c +++ b/ex00/ft_strcpy.c @@ -6,18 +6,15 @@ /* By: tischmid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/03/19 05:59:56 by tischmid #+# #+# */ -/* Updated: 2023/03/24 23:17:31 by tischmid ### ########.fr */ +/* Updated: 2023/03/26 00:53:19 by tischmid ### ########.fr */ /* */ /* ************************************************************************** */ char *ft_strcpy(char *s1, char *s2) { - int i; - - i = -1; - while (s2[++i] != '\0') - s1[i] = s2[i]; - s1[i] = '\0'; + while (*s2) + *s1++ = *s2++; + *s1 = 0; return (s1); } diff --git a/ex02/ft_str_is_alpha.c b/ex02/ft_str_is_alpha.c index 6549671..bff7d75 100644 --- a/ex02/ft_str_is_alpha.c +++ b/ex02/ft_str_is_alpha.c @@ -6,33 +6,27 @@ /* By: tischmid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/03/19 10:33:26 by tischmid #+# #+# */ -/* Updated: 2023/03/24 01:36:25 by tischmid ### ########.fr */ +/* Updated: 2023/03/26 01:00:36 by tischmid ### ########.fr */ /* */ /* ************************************************************************** */ int ft_str_is_alpha(char *str) { - int i; - - i = 0; - while ((str[i] | 32) >= 'a' && (str[i] | 32) <= 'z') - { - ++i; - } - return (str[i] == '\0'); + while ((*str | 32) >= 'a' && (*str | 32) <= 'z') + ++str; + return (!*str); } /* //// #include -#define STR "aa" +#define STR1 "abcdefg" int main(void) { - printf(STR "\n"); - if (ft_str_is_alpha(STR)) - printf("Contains only alphabetical characters\n"); + if (ft_str_is_alpha(STR1)) + printf(STR1 " contains only alphabetical characters\n"); else - printf("Contains non-alphabetical characters\n"); + printf(STR1 " contains non-alphabetical characters\n"); return (0); } */ //// diff --git a/ex03/ft_str_is_numeric.c b/ex03/ft_str_is_numeric.c index 80fcdce..acab34f 100644 --- a/ex03/ft_str_is_numeric.c +++ b/ex03/ft_str_is_numeric.c @@ -6,33 +6,27 @@ /* By: tischmid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/03/19 10:33:26 by tischmid #+# #+# */ -/* Updated: 2023/03/24 01:36:42 by tischmid ### ########.fr */ +/* Updated: 2023/03/26 01:01:32 by tischmid ### ########.fr */ /* */ /* ************************************************************************** */ int ft_str_is_numeric(char *str) { - int i; - - i = 0; - while (str[i] >= '0' && str[i] <= '9') - { - ++i; - } - return (str[i] == '\0'); + while (*str >= '0' && *str <= '9') + ++str; + return (!*str); } /* //// #include -#define STR "0123456789" +#define STR1 "0123456789" int main(void) { - printf(STR "\n"); - if (ft_str_is_numeric(STR)) - printf("Is numeric\n"); + if (ft_str_is_numeric(STR1)) + printf(STR1 " is numeric\n"); else - printf("Is not numeric\n"); + printf(STR1 " is not numeric\n"); return (0); } */ //// diff --git a/ex04/ft_str_is_lowercase.c b/ex04/ft_str_is_lowercase.c index 142ba87..9d6a73a 100644 --- a/ex04/ft_str_is_lowercase.c +++ b/ex04/ft_str_is_lowercase.c @@ -6,7 +6,7 @@ /* By: tischmid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/03/19 11:03:56 by tischmid #+# #+# */ -/* Updated: 2023/03/24 01:36:52 by tischmid ### ########.fr */ +/* Updated: 2023/03/24 23:21:18 by tischmid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -19,15 +19,14 @@ int ft_str_is_lowercase(char *str) /* //// #include -#define STR "abcd" +#define STR1 "abcd" int main(void) { - printf(STR "\n"); - if (ft_str_is_lowercase(STR)) - printf("Is all lowercase\n"); + if (ft_str_is_lowercase(STR1)) + printf(STR1 " is all lowercase\n"); else - printf("Contains non-lowercase characters\n"); + printf(STR1 " contains non-lowercase characters\n"); return (0); } */ //// diff --git a/ex05/ft_str_is_uppercase.c b/ex05/ft_str_is_uppercase.c index af3402c..2be85c5 100644 --- a/ex05/ft_str_is_uppercase.c +++ b/ex05/ft_str_is_uppercase.c @@ -6,33 +6,27 @@ /* By: tischmid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/03/19 11:03:56 by tischmid #+# #+# */ -/* Updated: 2023/03/24 01:36:59 by tischmid ### ########.fr */ +/* Updated: 2023/03/26 01:02:03 by tischmid ### ########.fr */ /* */ /* ************************************************************************** */ int ft_str_is_uppercase(char *str) { - int i; - - i = 0; - while (str[i] >= 'A' && str[i] <= 'Z') - { - ++i; - } - return (str[i] == '\0'); + while (*str >= 'A' && *str <= 'Z') + ++str; + return (!*str); } /* //// #include -#define STR "ABCDEf" +#define STR1 "ABCDEF" int main(void) { - printf(STR "\n"); - if (ft_str_is_uppercase(STR)) - printf("Is all uppercase\n"); + if (ft_str_is_uppercase(STR1)) + printf(STR1 " is all uppercase\n"); else - printf("Contains non-uppercase characters\n"); + printf(STR1 " contains non-uppercase characters\n"); return (0); } */ //// diff --git a/ex06/ft_str_is_printable.c b/ex06/ft_str_is_printable.c index dc93ef1..d54eff9 100644 --- a/ex06/ft_str_is_printable.c +++ b/ex06/ft_str_is_printable.c @@ -6,7 +6,7 @@ /* By: tischmid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/03/19 11:03:56 by tischmid #+# #+# */ -/* Updated: 2023/03/24 01:37:11 by tischmid ### ########.fr */ +/* Updated: 2023/03/24 23:20:56 by tischmid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -24,15 +24,14 @@ int ft_str_is_printable(char *str) /* //// #include -#define STR "BCDEF ~~~ " +#define STR1 "BCDEF ~~~ " int main(void) { - printf(STR "\n"); - if (ft_str_is_printable(STR)) - printf("Is printable\n"); + if (ft_str_is_printable(STR1)) + printf(STR1 " is printable\n"); else - printf("Is not printable\n"); + printf(STR1 " is not printable\n"); return (0); } */ //// diff --git a/ex07/ft_strupcase.c b/ex07/ft_strupcase.c index 6bb3f82..17999b4 100644 --- a/ex07/ft_strupcase.c +++ b/ex07/ft_strupcase.c @@ -6,22 +6,22 @@ /* By: tischmid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/03/19 11:18:13 by tischmid #+# #+# */ -/* Updated: 2023/03/24 01:37:20 by tischmid ### ########.fr */ +/* Updated: 2023/03/26 01:03:20 by tischmid ### ########.fr */ /* */ /* ************************************************************************** */ char *ft_strupcase(char *str) { - char *orig_str; + char *o_str; - orig_str = str; + o_str = str; while (*str) { if (*str >= 'a' && *str <= 'z') *str &= 95; ++str; } - return (orig_str); + return (o_str); } /* //// diff --git a/ex09/ft_strcapitalize.c b/ex09/ft_strcapitalize.c index 567141c..2f65854 100644 --- a/ex09/ft_strcapitalize.c +++ b/ex09/ft_strcapitalize.c @@ -6,7 +6,7 @@ /* By: tischmid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/03/19 11:27:43 by tischmid #+# #+# */ -/* Updated: 2023/03/24 01:37:33 by tischmid ### ########.fr */ +/* Updated: 2023/03/26 00:52:35 by tischmid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -29,7 +29,7 @@ char *ft_strcapitalize(char *str) if (is_alpha) *str &= 95; } - else if (inside_word && is_alpha) + else if (inside_word && (is_alpha || is_numeric)) *str |= 32; else inside_word = 0; @@ -41,7 +41,7 @@ char *ft_strcapitalize(char *str) /* //// #include #define STR "salut, com0123456789ment tu vas ? 42" \ - "mots quarante-deux; cinquante+et+un" + "mots quArAnAe-deux; cinquante+et+un" int main(void) {