Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

done l, width and percent #48

Merged
merged 12 commits into from
Jul 12, 2023
Merged

done l, width and percent #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
207a2d1
done l, width and percent
Jul 12, 2023
ff16aaf
Merge branch 'master' into cynthiar
CynthiaRobby Jul 12, 2023
6369284
done l, width and percent
Jul 12, 2023
7825d6a
Update s21_sprintf.h
CynthiaRobby Jul 12, 2023
b081700
Update s21_sprintf.c
CynthiaRobby Jul 12, 2023
a817528
Update s21_sprintf.c
CynthiaRobby Jul 12, 2023
a23af3a
Update s21_sprintf.h
CynthiaRobby Jul 12, 2023
8660b7e
update o
Jul 12, 2023
fdb65a3
Merge branch 'cynthiar' of github.com:VoLoK/s21_string into cynthiar
CynthiaRobby Jul 12, 2023
302e443
add suze
CynthiaRobby Jul 12, 2023
7e6af73
add suze
CynthiaRobby Jul 12, 2023
c98d4c6
Delete settings.json
VoLoK Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions src/String/includes/s21_sprintf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,35 @@
#ifndef SRC_S21_SPRINTF_H_
#define SRC_S21_SPRINTF_H_

#include <stdarg.h>
#include <limits.h>
#include <stdarg.h>

#include "s21_string.h"

char* s21_itoa(int input, char* buff, int num);
char* s21_convert(char* buff, int size, unsigned int num, int base);
void d_specific(char* temp, va_list list, char* p, s21_size_t len, int* i,
char* str, long long int num, int* size);
void c_specific(va_list list, char* str, int* i);
void f_specific(va_list, char*, char*, s21_size_t, int*, char*, int, int*);
void s_specific(va_list, char*, unsigned char, int*, char*);
char* str, long long int num, int* size, s21_size_t width);
void c_specific(va_list list, char* str, int* i, s21_size_t width, int* size);
void f_specific(va_list, char*, char*, s21_size_t, int*, char*, int, int*,
s21_size_t width);
void s_specific(va_list, char*, unsigned char, int*, char*, s21_size_t width,
int* size);
void flag_plus(va_list list, char* str, int* i, long long int* num);
void flag_space(va_list list, char* str, int* i, long long int* num);
char* s21_ftoa(char* buff, int size, float val, int digits);
int get_num(char** str);
int atoi(const char* str);
void o_specific(va_list list, char* str, int* i, long long int num);
void o_specific(va_list list, char* str, int* i, long long int num,
s21_size_t width, int* size);
char* s21_reverse(char* str);
void x_specific(va_list list, char* str, int* i, int spec_x, long long int num);
void percent_specific(void);
void x_specific(va_list list, char* str, int* i, int spec_x, long long int num,
s21_size_t width, int* size);
void percent_specific(char* str, int* i, int* size);
long long cast_to_h(va_list list, const char* format);
void u_specific(char* temp, va_list list, char* p, unsigned char len, int* i,
char* str, int* size, long long int num);
char* str, int* size, long long int num, s21_size_t width);
void s21_utoa(long long int n, char s[]);
long long cast_to_l(va_list list, const char* format);

#endif
163 changes: 137 additions & 26 deletions src/String/s21_sprintf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ int s21_sprintf(char* str, const char* format, ...) {
s21_size_t len = 0;
while (*format != 0 && i < size) {
if (*format++ == '%') {
s21_size_t width = 0;
if (*format >= '0' && *format <= '9') {
width = get_num((char**)&format);
}
if (*format == '+') {
flag_plus(list, str, &i, &num);
format++;
Expand All @@ -28,33 +32,37 @@ int s21_sprintf(char* str, const char* format, ...) {
format++;
num = cast_to_h(list, format);
}
if (*format == 'l') {
format++;
num = cast_to_l(list, format);
}
switch (*format++) {
case 'c':
c_specific(list, str, &i);
c_specific(list, str, &i, width, &size);
break;
case 'd':
d_specific(temp, list, p, len, &i, str, num, &size);
d_specific(temp, list, p, len, &i, str, num, &size, width);
break;
case 'f':
f_specific(list, p, temp, len, &i, str, pers_num, &size);
f_specific(list, p, temp, len, &i, str, pers_num, &size, width);
break;
case 's':
s_specific(list, p, len, &i, str);
s_specific(list, p, len, &i, str, width, &size);
break;
case 'o':
o_specific(list, str, &i, num);
o_specific(list, str, &i, num, width, &size);
break;
case 'x':
x_specific(list, str, &i, 1, num);
x_specific(list, str, &i, 1, num, width, &size);
break;
case 'X':
x_specific(list, str, &i, 0, num);
x_specific(list, str, &i, 0, num, width, &size);
break;
case 'u':
u_specific(temp, list, p, len, &i, str, &size, num);
u_specific(temp, list, p, len, &i, str, &size, num, width);
break;
case '%':
percent_specific();
percent_specific(str, &i, &size);
}
} else {
str[i++] = *(format - 1);
Expand Down Expand Up @@ -95,50 +103,100 @@ int get_num(char** str) {
return atoi(temp);
}

void c_specific(va_list list, char* str, int* i) {
void c_specific(va_list list, char* str, int* i, s21_size_t width, int* size) {
char c = va_arg(list, int);
s21_memset(&str[*i], c, 1);
if (width > 1) {
char padding = ' ';
int num_padding = width - 1;
for (int j = 0; j < num_padding; j++) {
s21_strncat(str, &padding, 1);
(*i)++;
(*size)++;
}
}
str[*i] = c;
*i += 1;
*size += 1;
}

void d_specific(char* temp, va_list list, char* p, s21_size_t len, int* i,
char* str, long long int num, int* size) {
char* str, long long int num, int* size, s21_size_t width) {
if (num != -1) {
p = s21_itoa(S21_TEXTMAX, temp, (int)num);
} else {
p = s21_itoa(S21_TEXTMAX, temp, va_arg(list, int));
}
len = s21_strlen(p);
if (width > len) {
char padding = ' ';
int num_padding = width - len;
for (int j = 0; j < num_padding; j++) {
s21_strncat(str, &padding, 1);
(*i)++;
(*size)++;
}
}
s21_strncat(str, p, len);
*i += len;
*size += len;
}

void f_specific(va_list list, char* p, char* temp, s21_size_t len, int* i,
char* str, int pers_num, int* size) {
char* str, int pers_num, int* size, s21_size_t width) {
float value = (float)va_arg(list, double);
p = s21_ftoa(temp, S21_TEXTMAX, value, pers_num);
len = s21_strlen(p);
s21_strncat(&str[*i], p, s21_strlen(p));
if (width > len) {
char padding = ' ';
int num_padding = width - len;
for (int j = 0; j < num_padding; j++) {
s21_strncat(str, &padding, 1);
(*i)++;
(*size)++;
}
}
s21_strncat(&str[*i], p, len);
*i += len;
*size += len;
}

void s_specific(va_list list, char* p, unsigned char len, int* i, char* str) {
void s_specific(va_list list, char* p, unsigned char len, int* i, char* str,
s21_size_t width, int* size) {
p = va_arg(list, char*);
len = (unsigned char)s21_strlen(p);
if (width > len) {
char padding = ' ';
int num_padding = width - len;
for (int j = 0; j < num_padding; j++) {
s21_strncat(str, &padding, 1);
(*i)++;
CynthiaRobby marked this conversation as resolved.
Show resolved Hide resolved
(*size)++;
}
}
s21_memset(&str[*i], ' ', 0);
s21_strncat(&str[*i], p, len);
*i += (len);
*i += len;
*size += len;
}

void o_specific(va_list list, char* str, int* i, long long int num) {
void o_specific(va_list list, char* str, int* i, long long int num,
s21_size_t width, int* size) {
if (num == -1) {
num = va_arg(list, int);
}
if (num == 0) {
if (width > 0) {
char padding = ' ';
int num_padding = width - 1;
for (int j = 0; j < num_padding; j++) {
s21_strncat(str, &padding, 1);
(*i)++;
CynthiaRobby marked this conversation as resolved.
Show resolved Hide resolved
(*size)++;
}
}
s21_memset(&str[*i], '0', 1);
*i += 1;
*size += 1;
} else {
char str2[100] = "";
int rez = 0;
Expand All @@ -151,19 +209,39 @@ void o_specific(va_list list, char* str, int* i, long long int num) {
}
s21_reverse(str2);
s21_size_t len_str2 = s21_strlen(str2);
if (width > len_str2) {
char padding = ' ';
int num_padding = width - len_str2;
for (int j = 0; j < num_padding; j++) {
s21_strncat(str, &padding, 1);
(*i)++;
(*size)++;
}
}
s21_memcpy(&str[*i], str2, len_str2);
*i += len_str2;
*size += len_str2;
}
}

void x_specific(va_list list, char* str, int* i, int spec_x,
long long int num) {
void x_specific(va_list list, char* str, int* i, int spec_x, long long int num,
s21_size_t width, int* size) {
if (num == -1) {
num = va_arg(list, int);
}
if (num == 0) {
if (width > 0) {
char padding = ' ';
int num_padding = width - 1;
for (int j = 0; j < num_padding; j++) {
s21_strncat(str, &padding, 1);
(*i)++;
(*size)++;
}
}
s21_memset(&str[*i], '0', 1);
*i += 1;
*size += 1;
} else {
char str2[100] = "";
int rez = 0;
Expand All @@ -177,8 +255,18 @@ void x_specific(va_list list, char* str, int* i, int spec_x,
}
s21_reverse(str2);
s21_size_t len_str2 = s21_strlen(str2);
if (width > len_str2) {
char padding = ' ';
int num_padding = width - len_str2;
for (int j = 0; j < num_padding; j++) {
s21_strncat(str, &padding, 1);
(*i)++;
(*size)++;
}
}
s21_memcpy(&str[*i], str2, len_str2);
*i += len_str2;
CynthiaRobby marked this conversation as resolved.
Show resolved Hide resolved
*size += len_str2;
}
}

Expand Down Expand Up @@ -289,6 +377,16 @@ long long cast_to_h(va_list list, const char* format) {
return num;
}

long long cast_to_l(va_list list, const char* format) {
long long num;
if (*format == 'd' || *format == 'i') {
num = (long)va_arg(list, long long);
} else {
num = (unsigned long)va_arg(list, long long);
}
return num;
}

void s21_utoa(long long int n, char s[]) {
long long int sign;
int i;
Expand All @@ -304,21 +402,34 @@ void s21_utoa(long long int n, char s[]) {
}

void u_specific(char* temp, va_list list, char* p, unsigned char len, int* i,
char* str, int* size, long long num) {
char* str, int* size, long long num, s21_size_t width) {
if (num == -1) {
num = va_arg(list, unsigned int);
}
if ((num > 0) && num <= INT_MAX) {
d_specific(temp, list, p, len, i, str, num, size);
d_specific(temp, list, p, len, i, str, num, size, width);
} else {
unsigned int usum = UINT_MAX - atoi(str);
char str2[1000];
s21_utoa(usum, str2);
s21_size_t len = s21_strlen(str2);
s21_strncat(str, str2, len);
*i += len;
*size += len;
s21_size_t len_str2 = s21_strlen(str2);
if (width > len_str2) {
char padding = ' ';
int num_padding = width - len_str2;
for (int j = 0; j < num_padding; j++) {
s21_strncat(str, &padding, 1);
*i += 1;
*size += 1;
}
}
s21_memcpy(&str[*i], str2, len_str2);
*i += len_str2;
*size += len_str2;
}
}

void percent_specific(void) {}
void percent_specific(char* str, int* i, int* size) {
s21_memset(&str[*i], '%', 1);
*i += 1;
*size += 1;
}