Deleted Added
sdiff udiff text old ( 170754 ) new ( 170764 )
full compact
sdiff.c (170754) sdiff.c (170764)
1/* sdiff - side-by-side merge of file differences
2
3 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 2001, 2002, 2004
4 Free Software Foundation, Inc.
5
6 This file is part of GNU DIFF.
7
8 GNU DIFF is free software; you can redistribute it and/or modify

--- 843 unchanged lines hidden (view full) ---

852}
853
854static void
855give_help (void)
856{
857 fprintf (stderr, "%s", _("\
858ed:\tEdit then use both versions, each decorated with a header.\n\
859eb:\tEdit then use both versions.\n\
1/* sdiff - side-by-side merge of file differences
2
3 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 2001, 2002, 2004
4 Free Software Foundation, Inc.
5
6 This file is part of GNU DIFF.
7
8 GNU DIFF is free software; you can redistribute it and/or modify

--- 843 unchanged lines hidden (view full) ---

852}
853
854static void
855give_help (void)
856{
857 fprintf (stderr, "%s", _("\
858ed:\tEdit then use both versions, each decorated with a header.\n\
859eb:\tEdit then use both versions.\n\
860el:\tEdit then use the left version.\n\
861er:\tEdit then use the right version.\n\
862e:\tEdit a new version.\n\
863l:\tUse the left version.\n\
864r:\tUse the right version.\n\
860el or e1:\tEdit then use the left version.\n\
861er or e2:\tEdit then use the right version.\n\
862e:\tDiscard both versions then edit a new one.\n\
863l or 1:\tUse the left version.\n\
864r or 2:\tUse the right version.\n\
865s:\tSilently include common lines.\n\
866v:\tVerbosely include common lines.\n\
867q:\tQuit.\n\
868"));
869}
870
871static int
872skip_white (void)

--- 39 unchanged lines hidden (view full) ---

912 {
913 if (putchar ('%') != '%')
914 perror_fatal (_("write failed"));
915 ck_fflush (stdout);
916
917 cmd0 = skip_white ();
918 switch (cmd0)
919 {
865s:\tSilently include common lines.\n\
866v:\tVerbosely include common lines.\n\
867q:\tQuit.\n\
868"));
869}
870
871static int
872skip_white (void)

--- 39 unchanged lines hidden (view full) ---

912 {
913 if (putchar ('%') != '%')
914 perror_fatal (_("write failed"));
915 ck_fflush (stdout);
916
917 cmd0 = skip_white ();
918 switch (cmd0)
919 {
920 case 'l': case 'r': case 's': case 'v': case 'q':
920 case '1': case '2': case 'l': case 'r':
921 case 's': case 'v': case 'q':
921 if (skip_white () != '\n')
922 {
923 give_help ();
924 flush_line ();
925 continue;
926 }
927 gotcmd = true;
928 break;
929
930 case 'e':
931 cmd1 = skip_white ();
932 switch (cmd1)
933 {
922 if (skip_white () != '\n')
923 {
924 give_help ();
925 flush_line ();
926 continue;
927 }
928 gotcmd = true;
929 break;
930
931 case 'e':
932 cmd1 = skip_white ();
933 switch (cmd1)
934 {
934 case 'b': case 'd': case 'l': case 'r':
935 case '1': case '2': case 'b': case 'd': case 'l': case 'r':
935 if (skip_white () != '\n')
936 {
937 give_help ();
938 flush_line ();
939 continue;
940 }
941 gotcmd = true;
942 break;

--- 21 unchanged lines hidden (view full) ---

964 case '\n':
965 give_help ();
966 continue;
967 }
968 }
969
970 switch (cmd0)
971 {
936 if (skip_white () != '\n')
937 {
938 give_help ();
939 flush_line ();
940 continue;
941 }
942 gotcmd = true;
943 break;

--- 21 unchanged lines hidden (view full) ---

965 case '\n':
966 give_help ();
967 continue;
968 }
969 }
970
971 switch (cmd0)
972 {
972 case 'l':
973 case '1': case 'l':
973 lf_copy (left, llen, outfile);
974 lf_skip (right, rlen);
975 return true;
974 lf_copy (left, llen, outfile);
975 lf_skip (right, rlen);
976 return true;
976 case 'r':
977 case '2': case 'r':
977 lf_copy (right, rlen, outfile);
978 lf_skip (left, llen);
979 return true;
980 case 's':
981 suppress_common_lines = true;
982 break;
983 case 'v':
984 suppress_common_lines = false;

--- 24 unchanged lines hidden (view full) ---

1009 if (llen == 1)
1010 fprintf (tmp, "--- %s %ld\n", lname, (long int) lline);
1011 else
1012 fprintf (tmp, "--- %s %ld,%ld\n", lname,
1013 (long int) lline,
1014 (long int) (lline + llen - 1));
1015 }
1016 /* Fall through. */
978 lf_copy (right, rlen, outfile);
979 lf_skip (left, llen);
980 return true;
981 case 's':
982 suppress_common_lines = true;
983 break;
984 case 'v':
985 suppress_common_lines = false;

--- 24 unchanged lines hidden (view full) ---

1010 if (llen == 1)
1011 fprintf (tmp, "--- %s %ld\n", lname, (long int) lline);
1012 else
1013 fprintf (tmp, "--- %s %ld,%ld\n", lname,
1014 (long int) lline,
1015 (long int) (lline + llen - 1));
1016 }
1017 /* Fall through. */
1017 case 'b': case 'l':
1018 case '1': case 'b': case 'l':
1018 lf_copy (left, llen, tmp);
1019 break;
1020
1021 default:
1022 lf_skip (left, llen);
1023 break;
1024 }
1025

--- 5 unchanged lines hidden (view full) ---

1031 if (rlen == 1)
1032 fprintf (tmp, "+++ %s %ld\n", rname, (long int) rline);
1033 else
1034 fprintf (tmp, "+++ %s %ld,%ld\n", rname,
1035 (long int) rline,
1036 (long int) (rline + rlen - 1));
1037 }
1038 /* Fall through. */
1019 lf_copy (left, llen, tmp);
1020 break;
1021
1022 default:
1023 lf_skip (left, llen);
1024 break;
1025 }
1026

--- 5 unchanged lines hidden (view full) ---

1032 if (rlen == 1)
1033 fprintf (tmp, "+++ %s %ld\n", rname, (long int) rline);
1034 else
1035 fprintf (tmp, "+++ %s %ld,%ld\n", rname,
1036 (long int) rline,
1037 (long int) (rline + rlen - 1));
1038 }
1039 /* Fall through. */
1039 case 'b': case 'r':
1040 case '2': case 'b': case 'r':
1040 lf_copy (right, rlen, tmp);
1041 break;
1042
1043 default:
1044 lf_skip (right, rlen);
1045 break;
1046 }
1047

--- 178 unchanged lines hidden --- 		1041 lf_copy (right, rlen, tmp);
1042 break;
1043
1044 default:
1045 lf_skip (right, rlen);
1046 break;
1047 }
1048

--- 178 unchanged lines hidden ---