Dev (#2)
* Restart from scratch
branched out on dev
removed all previous source files
started test on new env2lst function
* norm: splitted functions in main into appropriate file
Moved lstdelenvelem & env2lst to ms_env.c
Normed out files
* Feat(WIP): Added possibility to cmd_env to execute commands with
altered env.
Added dummy function for cd, echo, setenv & unsetenv
Started work on env copy feature
* feature: switched env from ft_list to specific list
* feature: added execution of commands from path
* feature: added env, setenv & unsetenv builtins
added -i option & command execution to env
added setenv & unsetenv builtins
* Clean-up: normed out files
* Changed comportment on error for check_path functions
* feature: added completion for ~ and ${}
WIP leaks detected on ${} completion
* fix leak on ext need test
* feature: added echo cmd
changed printf ref to ft_printf
* feature: add cd built-in
* Simple norm-out
* moved env functions to libft
* fixed out-of-memory access in extension
* Resolved infinite loop in extension revolving
WIP norming in cd
* Normedout cmd_cd.c
* Normed out functions in cmd_cd
* Normed out funtions
sorting out needed
* removed -fsanitize from Makefile
* corrected env -i crash & SHLVL
* Delete norm.txt
* added put_error_cd2 in put_error_cd.c
* added inline environment
This commit is contained in:
64
libft/srcs/ft_printf_tools_str.c
Normal file
64
libft/srcs/ft_printf_tools_str.c
Normal file
@@ -0,0 +1,64 @@
|
||||
/* ************************************************************************** */
|
||||
/* */
|
||||
/* ::: :::::::: */
|
||||
/* ft_printf_tools_str.c :+: :+: :+: */
|
||||
/* +:+ +:+ +:+ */
|
||||
/* By: klebon <klebon@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2018/05/19 09:05:22 by klebon #+# #+# */
|
||||
/* Updated: 2019/03/07 22:27:38 by tmaze ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "libft.h"
|
||||
|
||||
void ft_align_wstr(char *str, t_conv *field)
|
||||
{
|
||||
int i;
|
||||
int len;
|
||||
|
||||
i = 0;
|
||||
if (field->fl_witdth >= 1)
|
||||
{
|
||||
if (field->fl_minus)
|
||||
{
|
||||
while (str[i])
|
||||
i++;
|
||||
while (i < field->str_size)
|
||||
str[i++] = ' ';
|
||||
}
|
||||
else
|
||||
{
|
||||
len = (int)ft_strlen(str);
|
||||
ft_memmove(str + (field->str_size - len), str, len);
|
||||
while (i < (field->str_size - len))
|
||||
{
|
||||
str[i] = ' ';
|
||||
i++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
char *handle_output_str(t_conv *field, va_list ap)
|
||||
{
|
||||
char *output;
|
||||
int len;
|
||||
const char *str;
|
||||
|
||||
str = va_arg(ap, const char *);
|
||||
if (str == NULL)
|
||||
str = "(null)";
|
||||
len = (int)ft_strlen(str);
|
||||
if (field->fl_prec != -1)
|
||||
len = (len > field->fl_prec) ? field->fl_prec : len;
|
||||
field->str_size = (field->fl_witdth > len) ? field->fl_witdth : len;
|
||||
if (!(output = ft_strnew(field->str_size)))
|
||||
return (NULL);
|
||||
if (field->fl_prec == -1)
|
||||
ft_strcpy(output, str);
|
||||
else
|
||||
ft_strncpy(output, str, len);
|
||||
ft_align_wstr(output, field);
|
||||
return (output);
|
||||
}
|
||||
Reference in New Issue
Block a user