Merge pull request #13 from facetint/facetint

Facetint
facetint · Mar 5, 2024 · 05049db · 05049db
2 parents b97a836 + 1d9e4f3
commit 05049db
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 26 deletions.
diff --git a/builtin/export.c b/builtin/export.c
@@ -3,19 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   export.c                                           :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: hcoskun <hcoskun@student.42.fr>            +#+  +:+       +#+        */
+/*   By: facetint <facetint@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
-<<<<<<< HEAD:builtin/export.c
-/*   Created: 2024/03/02 14:15:14 by facetint          #+#    #+#             */
-<<<<<<< HEAD
-/*   Updated: 2024/03/03 16:54:57 by facetint         ###   ########.fr       */
-=======
-/*   Updated: 2024/03/03 11:39:15 by facetint         ###   ########.fr       */
-=======
-/*   Created: 2023/07/08 16:18:16 by hcoskun           #+#    #+#             */
-/*   Updated: 2023/07/11 14:47:49 by hcoskun          ###   ########.fr       */
->>>>>>> main:libft/ft_lstadd_back.c
->>>>>>> b447ad4643f5a8bac396730de020e4a38d9fe2be
+/*   Created: 2024/03/03 18:01:40 by facetint          #+#    #+#             */
+/*   Updated: 2024/03/03 18:01:41 by facetint         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

diff --git a/builtin/pwd.c b/builtin/pwd.c
@@ -3,25 +3,16 @@
 /*                                                        :::      ::::::::   */
 /*   pwd.c                                              :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: hcoskun <hcoskun@student.42.fr>            +#+  +:+       +#+        */
+/*   By: facetint <facetint@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
-<<<<<<< HEAD:builtin/pwd.c
 /*   Created: 2024/03/02 13:41:06 by facetint          #+#    #+#             */
-/*   Updated: 2024/03/03 13:17:22 by facetint         ###   ########.fr       */
+/*   Updated: 2024/03/03 18:01:51 by facetint         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "../includes/minishell.h"
 #include "../libft/libft.h"
 #include <stdio.h>
-=======
-/*   Created: 2023/06/24 20:30:45 by hcoskun42         #+#    #+#             */
-/*   Updated: 2023/12/31 15:40:54 by hcoskun42        ###   ########.tr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "libft.h"
->>>>>>> main:libft/ft_calloc.c
 #include "../memory-allocator/allocator.h"
 
 void    builtin_pwd(t_command *cmd)

diff --git a/env/env.c b/env/env.c
@@ -6,7 +6,7 @@
 /*   By: facetint <facetint@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/02/27 19:05:06 by facetint          #+#    #+#             */
-/*   Updated: 2024/03/03 17:06:20 by facetint         ###   ########.fr       */
+/*   Updated: 2024/03/03 18:11:18 by facetint         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -63,8 +63,6 @@ t_envList   *make_list(char **env)
         key = strdup_n(env[i], '=');
         value = ft_strchr(env[i], '=') + 1;
         lst = push_list(key, value, lst);
-        if (key)
-            safe_free(key);
         i++;
     }
     return (lst);