added fgets, puts, strdup and getline implementations

nerett · nerett · commit 0924a499352b · 2021-08-29T19:45:21.000+03:00
diff --git a/main.cpp b/main.cpp
@@ -3,18 +3,8 @@
 
 int main()
 {
+    char tested_string[50] = "abcdefg";
 
-    char tested_string1[50];
-    char tested_string2[50];
-    //char* ptr = NULL;
-    scanf( "%s", tested_string1 );
-    //ptr = string_utils_strchr(tested_string, 'x' );
-    string_utils_strcpy( tested_string2, tested_string1 );
-
-    printf( "next step\n" );
-    printf( "\n\n" );
-    //assert( ptr != NULL );
-    printf( "%s", tested_string2 );
 
 
     return 0;
diff --git a/standart_string_functions.depend b/standart_string_functions.depend
@@ -1,13 +1,13 @@
 # depslib dependency file v1.0
-1630237710 source:/home/shob/Dev/ILAB 2020-2021/standart_string_functions/string-utils.cpp
+1630255392 source:/home/shob/Dev/ILAB 2020-2021/standart_string_functions/string-utils.cpp
 	"string-utils.h"
 
-1630237704 /home/shob/Dev/ILAB 2020-2021/standart_string_functions/string-utils.h
+1630255448 /home/shob/Dev/ILAB 2020-2021/standart_string_functions/string-utils.h
 	<stdlib.h>
 	<stdio.h>
 	<assert.h>
 	<math.h>
 
-1630233845 source:/home/shob/Dev/ILAB 2020-2021/standart_string_functions/main.cpp
+1630254375 source:/home/shob/Dev/ILAB 2020-2021/standart_string_functions/main.cpp
 	"string-utils.h"
 
diff --git a/string-utils.cpp b/string-utils.cpp
@@ -111,7 +111,71 @@ static int plain_copy( char* destptr, char* srcptr, int startfrom, int endwhen )
 
 char* string_utils_fgets( char* input_string, int num, FILE* filestream )
 {
+    assert( input_string != NULL );
+    assert( filestream != NULL );
+    assert( std::isfinite( num ) );
+
+
+    int i = 0;
+    for( i; i < num; i++ )
+    {
+        input_string[i] = getc( filestream );
+    }
+    input_string[i+1] = '\0';
+
+    return input_string;
+}
+
+
+
+int string_utils_puts( char* input_string )
+{
+    assert( input_string != NULL );
+
+
+    for( int i = 0; i < string_utils_strlen( input_string ); i++ )
+    {
+        printf( "%c", input_string[i] );
+    }
+
+    printf( "\n" );
+    return 0;
+}
+
 
+
+char* string_utils_strdup( char* input_string )
+{
+    assert( input_string != NULL );
+
+
+    char* newstring = ( char* ) calloc( 50, sizeof( char ) );
+
+    plain_copy( newstring, input_string, 0, string_utils_strlen( input_string ) );
+
+    assert( newstring != NULL );
+    return newstring;
+}
+
+
+
+int string_utils_getline( char* output_string, int string_size, char symbol )
+{
+    assert( output_string != NULL );
+    assert( std::isfinite( string_size ) );
+    assert( std::isfinite( symbol ) );
+
+
+    char input = '0';
+    int i = 0;
+
+    while( input != symbol )
+    {
+        input = getchar();
+        output_string[i] = input;
+        i++;
+    }
+    return 1;
 }
 
 
diff --git a/string-utils.h b/string-utils.h
@@ -13,10 +13,9 @@ char* string_utils_strcpy( char * destptr, char * srcptr );
 char* string_utils_strncpy( char* destptr, char * srcptr, int num );
 char* string_utils_strcat( char * destptr, char * srcptr );
 char* string_utils_fgets( char* input_string, int num, FILE* filestream );
-/*
-string_utils_strdup
-string_utils_getline
-*/
+int string_utils_puts( char* input_string );
+char* string_utils_strdup( char* input_string );
+int string_utils_getline( char* output_string, int string_size, char symbol );
 
 static int plain_copy( char* destptr, char* srcptr, int startfrom, int endwhen );
 
