テキスト比較

2 つのテキストファイルの違いを見つける

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

ツール

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

Untitled diff

Created 10 years agoDiff never expires

Lines
Total
Removed

Words
Total
Removed

To continue using this feature, upgrade to Diffchecker Pro View Pricing

50 lines

Lines
Total
Added

Words
Total
Added

To continue using this feature, upgrade to Diffchecker Pro View Pricing

59 lines

#include <ctype.h>

#include <errno.h>

#include <regex.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <sys/types.h>

#include <limits.h>

#include "main.h"

#define to_find "^[a-zA-Z0-9]+$"

int main(int argc, char * argv[])

{

int ret_val;

regex_t regex;

FILE *fp;

char file[PATH_MAX];

char line[1024];

if (regcomp(&regex, to_find, REG_EXTENDED) != 0)

{

fprintf(stderr, "Failed to compile regex '%s'\n", to_find);

return EXIT_FAILURE;

}

if (argc > 2)

{

printf("Usage: tree OR tree [filename]\n");

return EXIT_FAILURE;

}

else if (argc == 2)

{

fp = fopen(strcat(argv[1],".dat"), "r");

sprintf(file, "%s.dat", argv[1]);

fp = fopen(file, "r");

if( fp == NULL ) {

perror("Error");

return -1;

}

printf("file opened\n");

while ((fgets(line, 1024, fp)) != NULL)

while (fscanf(fp, "%1023s", line) > 0)

{

line[strlen(line) - 1] = '\0';

if ((ret_val = regexec(&regex, line, 0, NULL, 0)) != 0)

if ((ret_val = regexec(&regex, line, 0, NULL, 0)) != 0);

{

printf("Error: %s\n", line);

printf("Not match: %s\n", line);

return EXIT_FAILURE;

//return EXIT_FAILURE;

} else {

printf("Match: %s\n", line);

}

regfree(&regex);

fclose(fp);

printf("File closed\n");

}

return 0;

}

保存された差分

原文

ファイルを開く

#include <ctype.h>
#include <errno.h>
#include <regex.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>

#include "main.h"

int main(int argc, char * argv[])
{
    int ret_val;
    regex_t regex;
    FILE *fp;
    char line[1024];

if (regcomp(&regex, to_find, REG_EXTENDED) != 0)
     {
        fprintf(stderr, "Failed to compile regex '%s'\n", to_find);
        return EXIT_FAILURE;
     }

if (argc > 2)
    {
        printf("Usage: tree OR tree [filename]\n");
        return EXIT_FAILURE;
    }

else if (argc == 2)
    {
        fp = fopen(strcat(argv[1],".dat"), "r");

printf("file opened\n");
        while ((fgets(line, 1024, fp)) != NULL)
        {
            line[strlen(line) - 1] = '\0';
            if ((ret_val = regexec(&regex, line, 0, NULL, 0)) != 0);
            {
                printf("Error: %s\n", line);
                return EXIT_FAILURE;
            }
        }

fclose(fp);
        printf("File closed\n");        
    }

return 0;
}

変更されたテキスト

ファイルを開く

#include <ctype.h>
#include <errno.h>
#include <regex.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include <limits.h>

#define to_find "^[a-zA-Z0-9]+$"

int main(int argc, char * argv[])
{
    int ret_val;
    regex_t regex;
    FILE *fp;
    char file[PATH_MAX];
    char line[1024];

if (regcomp(&regex, to_find, REG_EXTENDED) != 0)
     {
        fprintf(stderr, "Failed to compile regex '%s'\n", to_find);
        return EXIT_FAILURE;
     }

if (argc > 2)
    {
        printf("Usage: tree OR tree [filename]\n");
        return EXIT_FAILURE;
    }

else if (argc == 2)
    {
        sprintf(file, "%s.dat", argv[1]);
        fp = fopen(file, "r");
        if( fp == NULL ) {
            perror("Error");
            return -1;
        }

printf("file opened\n");
        while (fscanf(fp, "%1023s", line) > 0)
        {
            if ((ret_val = regexec(&regex, line, 0, NULL, 0)) != 0)
            {
                printf("Not match: %s\n", line);
                //return EXIT_FAILURE;
            } else {
                printf("Match: %s\n", line);
            }
        }

regfree(&regex);
        fclose(fp);
        printf("File closed\n");        
    }

return 0;
}