port lab21 lab22 lab24 to string_my library

lab21/lab21/main.c

@@ -2,6 +2,8 @@
 #include <string.h>
 #include <locale.h>
 #include <Windows.h>
+#include "../../string_my/string_my.h"
+
 
 void task1() {
 	printf("task1 Ââåäèòå ñèìâîë: ");
@@ -97,19 +99,6 @@ void task6_1() {
 	printf("Ñòðîêà ïîñëå îáðàáîòêè: \"%s\"\n", str);
 }
 
-char toupperMY(char ch) {
-	if (ch >= 'a' && ch <= 'z') {
-		return 'A' + (ch - 'a');
-	}
-	if (ch >= 'à' && ch <= 'ÿ') {
-		return 'À' + (ch - 'à');
-	}
-	if (ch == '¸') {
-		return '¨';
-	}
-	return ch;
-}
-
 void task6_2() {
 	char str[81];
 	printf("task6_2 Ââåäèòå ñòðîêó: ");

lab22/lab22.vcxproj

@@ -127,8 +127,12 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\string_my\string_my.c" />
     <ClCompile Include="main.c" />
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\string_my\string_my.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

lab22/lab22.vcxproj.filters

@@ -18,5 +18,13 @@
     <ClCompile Include="main.c">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
+    <ClCompile Include="..\string_my\string_my.c">
+      <Filter>Исходные файлы</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\string_my\string_my.h">
+      <Filter>Файлы заголовков</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

lab22/main.c

@@ -3,91 +3,7 @@
 #include <string.h>
 #include <locale.h>
 #include <Windows.h>
-
-int strlen_my_arr(char str[]) {
-	int len = 0;
-	while (str[len] != '\0') {
-		len++;
-	}
-	return len;
-}
-
-int strlen_my_ptr(char* str_ptr) {
-	char* str_ptr_old = str_ptr;
-	while (*str_ptr != '\0') {
-		str_ptr++;
-	}
-	return (int)(str_ptr - str_ptr_old);
-}
-
-int strcmp_my_arr(char str1[], char str2[]) {
-	int i = 0;
-	while (str1[i] != '\0' && str2[i] != '\0' && str1[i] == str2[i]) {
-		i++;
-	}
-	return str1[i] - str2[i];
-}
-
-int strcmp_my_ptr(char* str1, char* str2) {
-	while (*str1 != '\0' && *str2 != '\0' && *str1 == *str2) {
-		str1++;
-		str2++;
-	}
-	return *str1 - *str2;
-}
-
-char* strcpy_my_arr(char dest[], char source[]) {
-	int i = 0;
-	while (source[i] != '\0') {
-		dest[i] = source[i];
-		i++;
-	}
-	dest[i] = '\0';
-	return dest;
-}
-
-char* strcpy_my_ptr(char* dest, char* source) {
-	while (*source != '\0') {
-		*dest = *source;
-		dest++;
-		source++;
-	}
-	*dest = '\0';
-	return dest;
-}
-
-char* strcat_my_ptr(char* destination, const char* source) {
-	while (*destination != '\0') {
-		destination++;
-	}
-	while (*source != '\0') {
-		*destination = *source;
-		destination++;
-		source++;
-	}
-	return destination;
-}
-
-char* strchr_my_arr(char str[], int ch) {
-	int i = 0;
-	while (str[i] != '\0') {
-		if (str[i] == (char)ch) {
-			return &str[i];
-		}
-		i++;
-	}
-	return NULL;
-}
-
-char* strchr_my_ptr(char* str, int ch) {
-	while (*str != '\0') {
-		if (*str == (char)ch) {
-			return str;
-		}
-		str++;
-	}
-	return NULL;
-}
+#include "../string_my/string_my.h"
 
 int main() {
 	char test1[] = "1234567";

lab24/lab24.vcxproj

@@ -127,6 +127,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\string_my\string_my.c" />
     <ClCompile Include="main.c" />
   </ItemGroup>
   <ItemGroup>
@@ -137,6 +138,9 @@
     <Text Include="files\text1.txt" />
     <Text Include="files\text2.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\string_my\string_my.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

lab24/lab24.vcxproj.filters

@@ -18,6 +18,9 @@
     <ClCompile Include="main.c">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
+    <ClCompile Include="..\string_my\string_my.c">
+      <Filter>Исходные файлы</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="files\out1.html">
@@ -35,4 +38,9 @@
       <Filter>Файлы ресурсов</Filter>
     </Text>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\string_my\string_my.h">
+      <Filter>Файлы заголовков</Filter>
+    </ClInclude>
+  </ItemGroup>
 </Project>

lab24/main.c

@@ -3,46 +3,10 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
+#include "../string_my/string_my.h"
 
 #define BUFLEN 128
 
-int getNextDelim(FILE* file, int* token) {
-	int ch = getc(file);
-	if (ch == EOF) {
-		return 0;
-	}
-
-	if (isalnum(ch)) {
-		ungetc(ch, file);
-		return 0;
-	}
-
-	*token = ch;
-	return 1;
-}
-
-int getNextWord(FILE* file, char token[], int len) {
-	int ch;
-	int i = 0;
-	while ((ch = getc(file)) != EOF && (i < len - 1)) {
-		if (isalnum(ch)) {
-			token[i] = ch;
-		}
-		else {
-			break;
-		}
-		i += 1;
-	}
-	ungetc(ch, file);
-	token[i] = '\0';
-	if (i == 0) {
-		return 0;
-	}
-	else {
-		return 1;
-	}
-}
-
 void task1() {
 	FILE* fin = fopen("files/text1.txt", "r");
 	if (fin == NULL) {