c

anonkey · Sep 26, 2014 · d8443b8 · d8443b8
1 parent 4d415c6
commit d8443b8
Show file tree

Hide file tree

Showing 97 changed files with 160 additions and 23 deletions.
diff --git a/ft_atoi.c b/ft_atoi.c
@@ -11,6 +11,7 @@
 /* ************************************************************************** */
 
 #include "libft.h"
+#include <limits.h>
 
 static int	ft_isspace(int c)
 {
@@ -25,7 +26,7 @@ long		ft_atol(const char *str)
 	number = 0;
 	if (ft_strncmp(str, "-9223372036854775808", 20) == 0
 		&& (str[20] < '0' || str[20] > '9'))
-		return (-9223372036854775807 - 1);
+		return (LONG_MIN);
 	while (ft_isspace(*str))
 		++str;
 	sign = (*str == '-') ? -1 : 1;

diff --git a/ft_atoi_base.c b/ft_atoi_base.c
diff --git a/ft_btree.c b/ft_btree.c
diff --git a/ft_btree_put.c b/ft_btree_put.c
diff --git a/ft_bzero.c b/ft_bzero.c
diff --git a/ft_getchar.c b/ft_getchar.c
diff --git a/ft_isalnum.c b/ft_isalnum.c
diff --git a/ft_isalpha.c b/ft_isalpha.c
diff --git a/ft_isascii.c b/ft_isascii.c
diff --git a/ft_isdigit.c b/ft_isdigit.c
diff --git a/ft_isprint.c b/ft_isprint.c
diff --git a/ft_itoa.c b/ft_itoa.c
diff --git a/ft_ldcd_celldel.c b/ft_ldcd_celldel.c
diff --git a/ft_ldcd_cellnew.c b/ft_ldcd_cellnew.c
diff --git a/ft_ldcdat.c b/ft_ldcdat.c
diff --git a/ft_ldcddel.c b/ft_ldcddel.c
diff --git a/ft_ldcddel_head.c b/ft_ldcddel_head.c
diff --git a/ft_ldcddel_tail.c b/ft_ldcddel_tail.c
diff --git a/ft_ldcditer.c b/ft_ldcditer.c
diff --git a/ft_ldcdnew.c b/ft_ldcdnew.c
diff --git a/ft_ldcdpop.c b/ft_ldcdpop.c
diff --git a/ft_ldcdpop_back.c b/ft_ldcdpop_back.c
diff --git a/ft_ldcdpop_front.c b/ft_ldcdpop_front.c
diff --git a/ft_ldcdpush_back.c b/ft_ldcdpush_back.c
diff --git a/ft_ldcdpush_front.c b/ft_ldcdpush_front.c
diff --git a/ft_ldcdsize.c b/ft_ldcdsize.c
diff --git a/ft_ldcdsize_ref.c b/ft_ldcdsize_ref.c
diff --git a/ft_lstadd.c b/ft_lstadd.c
diff --git a/ft_lstdel.c b/ft_lstdel.c
diff --git a/ft_lstdelone.c b/ft_lstdelone.c
diff --git a/ft_lstiter.c b/ft_lstiter.c
diff --git a/ft_lstmap.c b/ft_lstmap.c
diff --git a/ft_lstnew.c b/ft_lstnew.c
diff --git a/ft_lstsize.c b/ft_lstsize.c
diff --git a/ft_lsttotab.c b/ft_lsttotab.c
diff --git a/ft_memalloc.c b/ft_memalloc.c
diff --git a/ft_memccpy.c b/ft_memccpy.c
diff --git a/ft_memchr.c b/ft_memchr.c
diff --git a/ft_memcmp.c b/ft_memcmp.c
diff --git a/ft_memcpy.c b/ft_memcpy.c
diff --git a/ft_memdel.c b/ft_memdel.c
diff --git a/ft_memmove.c b/ft_memmove.c
diff --git a/ft_memset.c b/ft_memset.c
diff --git a/ft_print_memory.c b/ft_print_memory.c
@@ -12,7 +12,7 @@
 
 #include "libft.h"
 
-extern const char	*g_hexbase;
+static const char	*g_hexbase = "0123456789abcdef";
 
 static void	ft_fill(int count, int space)
 {
@@ -52,7 +52,7 @@ static void	ft_putnstr(char *str, unsigned int len, int hex, int space)
 
 static void	ft_putline(char *addr, unsigned int offset, unsigned int size)
 {
-	ft_putnbrhex(offset, 0);
+	ft_putnbrhex(offset, 8, 0);
 	ft_putchar(':');
 	ft_putchar('\t');
 	ft_putnstr(addr + offset, size, 1, 2);
@@ -66,7 +66,7 @@ void		*ft_print_memory(void *addr, unsigned int size)
 	unsigned int		count;
 
 	count = 0;
-	while (size - 16 > count)
+	while (size - 16 > count && size - 16 > 0)
 	{
 		ft_putline(addr, count, 16);
 		count += 16;

diff --git a/ft_putchar.c b/ft_putchar.c
@@ -12,7 +12,7 @@
 
 #include <unistd.h>
 
-void	ft_putchar(char c)
+int	ft_putchar(char c)
 {
-	write(1, &c, 1);
+	return (write(1, &c, 1));
 }
diff --git a/ft_putchar_fd.c b/ft_putchar_fd.c
diff --git a/ft_putdouble.c b/ft_putdouble.c
@@ -0,0 +1,56 @@
+#include <unistd.h>
+#include "libft.h"
+
+//TODO: width specifier,fill char
+
+static int		ft_printradix(double nb, int prec)
+{
+	char	digit;
+	int		size;
+
+	size = prec + 1;
+	write(1, ".", 1);
+	while (prec > 0)
+	{
+		if (nb != 0)
+		{
+			nb *= 10;
+			digit = (char)nb;
+			nb -= (double)digit;
+			ft_putchar(digit + '0');
+		}
+		else
+			ft_putchar('0');
+		--prec;
+	}
+	return (size);
+}
+
+int		ft_putdouble(double nb, int prec)
+{
+	int		size;
+	double	mask;
+	char	digit;
+
+	size = 0;
+	mask = 1.0;
+	if (nb < 0)
+	{
+		nb = 0 - nb;
+		write(1, "-", 1);
+		++size;
+	}
+	while (nb / mask > 10.0)
+		mask *= 10.0;
+	while (mask >= 1.0)
+	{
+		digit = (char)(nb / mask);
+		++size;
+		nb -= mask * (double)digit;
+		mask /= 10.0;
+		ft_putchar(digit + '0');
+	}
+	if (prec > 0)
+		size += ft_printradix(nb, prec);
+	return (size);
+}
diff --git a/ft_putendl.c b/ft_putendl.c
@@ -13,8 +13,9 @@
 #include <unistd.h>
 #include "libft.h"
 
-void	ft_putendl(char const *s)
+int	ft_putendl(char const *s)
 {
-	ft_putstr(s);
-	write(1, "\n", 1);
+    int	    len;
+	len = ft_putstr(s);
+	return (len + write(1, "\n", 1));
 }
diff --git a/ft_putendl_fd.c b/ft_putendl_fd.c
diff --git a/ft_putnbr.c b/ft_putnbr.c
diff --git a/ft_putnbr_base.c b/ft_putnbr_base.c
diff --git a/ft_putnbr_fd.c b/ft_putnbr_fd.c
diff --git a/ft_putnbr_ll.c b/ft_putnbr_ll.c
@@ -0,0 +1,22 @@
+#include "libft.h"
+#include <limits.h>
+
+int	ft_putnbr_ll(long long nbr)
+{
+	char		digit;
+	unsigned long	size;
+
+// long max
+	if (nbr < 0)
+	{
+	    ft_putchar('-');
+	    nbr = 0 - nbr;
+	}
+	digit = (char)(nbr % 10);
+	if (nbr >= 10)
+		size = ft_putnbr_ll(nbr / 10);
+	else
+		size = 1;
+	ft_putchar('0' + digit);
+	return (size);
+}
diff --git a/ft_putnbr_oct.c b/ft_putnbr_oct.c
@@ -0,0 +1,30 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_putnbroct.c                                     :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: tseguier <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2014/08/01 04:33:12 by tseguier          #+#    #+#             */
+/*   Updated: 2014/08/01 04:35:47 by tseguier         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft.h"
+
+static const char	*g_octbase = "01234567";
+
+void		ft_putnbr_oct(unsigned long long nb, unsigned int len)
+{
+	char	nb_act;
+
+	nb_act = nb % 8;
+	if (nb >= 8)
+		ft_putnbr_oct(nb / 8, len > 0 ? len - 1 : 0);
+	else if (len > 0)
+	{
+		while (--len > 0)
+		    ft_putchar('0');
+	}
+	ft_putchar(g_octbase[(int)nb_act]);
+}
diff --git a/ft_putnbr_ull.c b/ft_putnbr_ull.c
@@ -0,0 +1,16 @@
+#include "libft.h"
+#include <limits.h>
+
+int	ft_putnbr_ull(unsigned long long nbr)
+{
+	char		digit;
+	unsigned long	size;
+
+	digit = (char)(nbr % 10);
+	if (nbr >= 10)
+		size = ft_putnbr_ull(nbr / 10);
+	else
+		size = 1;
+	ft_putchar('0' + digit);
+	return (size);
+}
diff --git a/ft_putnbrhex.c b/ft_putnbrhex.c
@@ -12,19 +12,27 @@
 
 #include "libft.h"
 
-const char	*g_hexbase = "0123456789abcdef";
+static const char	*g_hexbase = "0123456789abcdef";
+static const char	*g_hexbase_maj = "0123456789ABCDEF";
 
-void		ft_putnbrhex(unsigned int nb, unsigned int len)
+int		ft_putnbrhex(unsigned long long nb, unsigned int len, int maj)
 {
 	char	nb_act;
+	int	size;
 
 	nb_act = nb % 16;
+	size = 0;
 	if (nb >= 16)
-		ft_putnbrhex(nb / 16, len + 1);
-	else
+		size = ft_putnbrhex(nb / 16, len > 0 ? len - 1 : 0, maj);
+	else if (len > 0)
 	{
-		while (len++ < 8)
-			ft_putchar('0');
+		size = len - 1;
+		while (--len > 0)
+		    ft_putchar('0');
 	}
-	ft_putchar(g_hexbase[(int)nb_act]);
+	if (maj)
+		ft_putchar(g_hexbase_maj[(int)nb_act]);
+	else
+		ft_putchar(g_hexbase[(int)nb_act]);
+	return (1 + size);
 }
diff --git a/ft_putstr.c b/ft_putstr.c
@@ -13,10 +13,10 @@
 #include <unistd.h>
 #include "libft.h"
 
-void	ft_putstr(char const *s)
+int	ft_putstr(char const *s)
 {
 	if (!s)
-		write(1, "(NULL)", 6);
+		return (write(1, "(NULL)", 6));
 	else
-		write(1, s, ft_strlen(s));
+		return (write(1, s, ft_strlen(s)));
 }
diff --git a/ft_putstr_fd.c b/ft_putstr_fd.c
diff --git a/ft_strcat.c b/ft_strcat.c
diff --git a/ft_strchind.c b/ft_strchind.c
diff --git a/ft_strchr.c b/ft_strchr.c
diff --git a/ft_strclr.c b/ft_strclr.c
diff --git a/ft_strcmp.c b/ft_strcmp.c
diff --git a/ft_strcpy.c b/ft_strcpy.c
diff --git a/ft_strcsub.c b/ft_strcsub.c
diff --git a/ft_strdel.c b/ft_strdel.c
diff --git a/ft_strdup.c b/ft_strdup.c
diff --git a/ft_strequ.c b/ft_strequ.c
diff --git a/ft_striter.c b/ft_striter.c
diff --git a/ft_striteri.c b/ft_striteri.c
diff --git a/ft_strjoin.c b/ft_strjoin.c
diff --git a/ft_strlcat.c b/ft_strlcat.c
diff --git a/ft_strlen.c b/ft_strlen.c
diff --git a/ft_strmap.c b/ft_strmap.c
diff --git a/ft_strmapi.c b/ft_strmapi.c
diff --git a/ft_strncat.c b/ft_strncat.c
diff --git a/ft_strncmp.c b/ft_strncmp.c
diff --git a/ft_strncpy.c b/ft_strncpy.c
diff --git a/ft_strnequ.c b/ft_strnequ.c
diff --git a/ft_strnew.c b/ft_strnew.c
diff --git a/ft_strnstr.c b/ft_strnstr.c
diff --git a/ft_strrchind.c b/ft_strrchind.c
diff --git a/ft_strrchr.c b/ft_strrchr.c
diff --git a/ft_strrev.c b/ft_strrev.c
diff --git a/ft_strsepjoin.c b/ft_strsepjoin.c
diff --git a/ft_strsplit.c b/ft_strsplit.c
diff --git a/ft_strstr.c b/ft_strstr.c
diff --git a/ft_strsub.c b/ft_strsub.c
diff --git a/ft_strtabcpy.c b/ft_strtabcpy.c
diff --git a/ft_strtabdel.c b/ft_strtabdel.c
diff --git a/ft_strtabrealloc.c b/ft_strtabrealloc.c
diff --git a/ft_strtrim.c b/ft_strtrim.c
diff --git a/ft_tolower.c b/ft_tolower.c
diff --git a/ft_toupper.c b/ft_toupper.c
diff --git a/get_next_line.c b/get_next_line.c
diff --git a/headers/libft.h b/headers/libft.h
@@ -21,16 +21,19 @@
 ** Affichage
 */
 void		*ft_print_memory(void *addr, unsigned int size);
-void		ft_putnbrhex(unsigned int nb, unsigned int len);
-void		ft_putchar(char c);
-void		ft_putstr(char const *s);
-void		ft_putendl(char const *s);
+int		ft_putnbrhex(unsigned long long nb, unsigned int len, int maj);
+void		ft_putnbr_oct(unsigned long long nb, unsigned int len);
+int		ft_putchar(char c);
+int		ft_putstr(char const *s);
+int		ft_putendl(char const *s);
 void		ft_putnbr(int n);
 void		ft_putchar_fd(char c, int fd);
 void		ft_putstr_fd(char const *s, int fd);
 void		ft_putendl_fd(char const *s, int fd);
 void		ft_putnbr_fd(int n, int fd);
 void		ft_putnbr_base(int nbr, char *base);
+int		ft_putnbr_ll(long long nbr);
+int		ft_putnbr_ull(unsigned long long nbr);
 /*
 ** Memory
 */

diff --git a/main.c b/main.c