mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use "'" instead of "`" for messages and comments quoting. 

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2013-05-26 10:11:06 +04:00 committed by Slava Zanko
parent d0955f3793
commit e7dc599e42
26 changed files with 72 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/global.h
View File

@ -136,7 +136,7 @@
#define UTF8_CHAR_LEN 6
/* Used to distinguish between a normal MC termination and */
/* one caused by typing `exit' or `logout' in the subshell */
/* one caused by typing 'exit' or 'logout' in the subshell */
#define SUBSHELL_EXIT 128
/* C++ style type casts */

8
lib/util.h
View File

@ -29,9 +29,9 @@
/* Pathname canonicalization */
typedef enum
{
CANON_PATH_JOINSLASHES = 1L << 0, /* Multiple `/'s are collapsed to a single `/'. */
CANON_PATH_REMSLASHDOTS = 1L << 1, /* Leading `./'s, `/'s and trailing `/.'s are removed. */
CANON_PATH_REMDOUBLEDOTS = 1L << 3, /* Non-leading `../'s and trailing `..'s are handled by removing */
CANON_PATH_JOINSLASHES = 1L << 0, /* Multiple '/'s are collapsed to a single '/'. */
CANON_PATH_REMSLASHDOTS = 1L << 1, /* Leading './'s, '/'s and trailing '/.'s are removed. */
CANON_PATH_REMDOUBLEDOTS = 1L << 3, /* Non-leading '../'s and trailing '..'s are handled by removing */
CANON_PATH_GUARDUNC = 1L << 4, /* Detect and preserve UNC paths: //server/... */
CANON_PATH_ALL = CANON_PATH_JOINSLASHES
| CANON_PATH_REMSLASHDOTS | CANON_PATH_REMDOUBLEDOTS | CANON_PATH_GUARDUNC
@ -168,7 +168,7 @@ void canonicalize_pathname (char *);
char *mc_realpath (const char *path, char *resolved_path);
#endif
/* Looks for ``magic'' bytes at the start of the VFS file to guess the
/* Looks for "magic" bytes at the start of the VFS file to guess the
* compression type. Side effect: modifies the file position. */
enum compression_type get_compression_type (int fd, const char *);
const char *decompress_extension (int type);

8
lib/utilunix.c
View File

@ -612,10 +612,10 @@ close_error_pipe (int error, const char *text)
/**
* Canonicalize path, and return a new path. Do everything in place.
* The new path differs from path in:
* Multiple `/'s are collapsed to a single `/'.
* Leading `./'s and trailing `/.'s are removed.
* Trailing `/'s are removed.
* Non-leading `../'s and trailing `..'s are handled by removing
* Multiple '/'s are collapsed to a single '/'.
* Leading './'s and trailing '/.'s are removed.
* Trailing '/'s are removed.
* Non-leading '../'s and trailing '..'s are handled by removing
* portions of the path.
* Well formed UNC paths are modified only in the local part.
*/

2
lib/vfs/parse_ls_vga.c
View File

@ -1,5 +1,5 @@
/*
Routines for parsing output from the `ls' command.
Routines for parsing output from the 'ls' command.
Copyright (C) 1988, 1992, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
2005, 2006, 2007, 2011

6
lib/widget/input_complete.c
View File

@ -290,7 +290,7 @@ filename_completion_function (const char *text, int state, input_complete_t flag
{
g_string_append (temp, users_dirname);
/* We need a `/' at the end. */
/* We need a '/' at the end. */
if (temp->str[temp->len - 1] != PATH_SEP)
g_string_append_c (temp, PATH_SEP);
}
@ -851,7 +851,7 @@ try_complete_commands_prepare (try_complete_automation_state_t * state, char *te
if (ti != text)
{
/* Handle the two character tokens `>&', `<&', and `>|'.
/* Handle the two character tokens '>&', '<&', and '>|'.
We are not in a command position after one of these. */
this_char = ti[0];
prev_char = str_get_prev_char (ti)[0];
@ -1339,7 +1339,7 @@ try_complete (char *text, int *lc_start, int *lc_end, input_complete_t flags)
*lc_start += state.r - state.word;
}
/* Starts with `~' and there is no slash in the word, then
/* Starts with '~' and there is no slash in the word, then
try completing this word as a username. */
if (!matches && *state.word == '~' && (state.flags & INPUT_COMPLETE_USERNAMES)
&& !strchr (state.word, PATH_SEP))

2
m4.include/fsusage.m4
View File

@ -42,7 +42,7 @@ ac_fsusage_space=no
# Perform only the link test since it seems there are no variants of the
# statvfs function. This check is more than just AC_CHECK_FUNCS([statvfs])
# because that got a false positive on SCO OSR5. Adding the declaration
# of a `struct statvfs' causes this test to fail (as it should) on such
# of a 'struct statvfs' causes this test to fail (as it should) on such
# systems. That system is reported to work fine with STAT_STATFS4 which
# is what it gets when this test fails.
if test $ac_fsusage_space = no; then

4
m4.include/ls-mntd-fs.m4
View File

@ -70,7 +70,7 @@ AC_FUNC_GETMNTENT
# with other getmntent implementations.
# NOTE: Normally, I wouldn't use a check for system type as I've done for
# `CRAY' below since that goes against the whole autoconf philosophy. But
# 'CRAY' below since that goes against the whole autoconf philosophy. But
# I think there is too great a chance that some non-Cray system has a
# function named listmntent to risk the false positive.
@ -110,7 +110,7 @@ if test -z "$ac_list_mounted_fs"; then
AC_DEFINE([MOUNTED_VMOUNT], [1],
[Define if there is a function named mntctl that can be used to read
the list of mounted file systems, and there is a system header file
that declares `struct vmount.' (AIX)])
that declares 'struct vmount.' (AIX)])
fi
fi

2
m4.include/mc-vfs.m4
View File

@ -35,7 +35,7 @@ AC_DEFUN([MC_ENABLE_VFS_NET],
if test x"$have_socket" = xyes; then
AC_CHECK_TYPE([nlink_t], ,
[AC_DEFINE_UNQUOTED([nlink_t], [unsigned int],
[Define to `unsigned int' if <sys/types.h> does not define.])])
[Define to 'unsigned int' if <sys/types.h> does not define.])])
AC_CHECK_TYPES([socklen_t],,,
[
#include <sys/types.h>

10
po/mc.pot
View File

@ -880,7 +880,7 @@ msgstr ""
#: src/args.c:409
msgid ""
"\n"
"Please send any bug reports (including the output of `mc -V')\n"
"Please send any bug reports (including the output of 'mc -V')\n"
"as tickets at www.midnight-commander.org\n"
msgstr ""
@ -2051,7 +2051,7 @@ msgstr ""
#: src/execute.c:487
#, c-format
msgid "Type `exit' to return to the Midnight Commander"
msgid "Type 'exit' to return to the Midnight Commander"
msgstr ""
#: src/filemanager/achown.c:94 src/filemanager/chmod.c:121
@ -2781,7 +2781,7 @@ msgstr ""
#: src/filemanager/cmd.c:1381
#, c-format
msgid "Symlink `%s' points to:"
msgid "Symlink '%s' points to:"
msgstr ""
#: src/filemanager/cmd.c:1388
@ -2800,7 +2800,7 @@ msgstr ""
#: src/filemanager/cmd.c:1421
#, c-format
msgid "`%s' is not a symbolic link"
msgid "'%s' is not a symbolic link"
msgstr ""
#: src/filemanager/cmd.c:1515
@ -3425,7 +3425,7 @@ msgstr ""
#: src/filemanager/filegui.c:1265
#, c-format
msgid "Invalid source pattern `%s'"
msgid "Invalid source pattern '%s'"
msgstr ""
#: src/filemanager/find.c:186

10
po/ru.po
View File

@ -706,7 +706,7 @@ msgstr "Задать начальную строку для встроенног
msgid ""
"\n"
"Please send any bug reports (including the output of `mc -V')\n"
"Please send any bug reports (including the output of 'mc -V')\n"
"as tickets at www.midnight-commander.org\n"
msgstr ""
"\n"
@ -1600,7 +1600,7 @@ msgid "The shell is already running a command"
msgstr "Интерпретатор занят выполнением команды"
#, c-format
msgid "Type `exit' to return to the Midnight Commander"
msgid "Type 'exit' to return to the Midnight Commander"
msgstr "Введите exit для возврата в Midnight Commander"
msgid "Set &all"
@ -2157,7 +2157,7 @@ msgstr ""
"панели не могут быть отключены."
#, c-format
msgid "Symlink `%s' points to:"
msgid "Symlink '%s' points to:"
msgstr "Символическая ссылка %s указывает на:"
msgid "Edit symlink"
@ -2172,7 +2172,7 @@ msgid "edit symlink: %s"
msgstr "правка символической ссылки: %s"
#, c-format
msgid "`%s' is not a symbolic link"
msgid "'%s' is not a symbolic link"
msgstr "%s не является символической ссылкой"
msgid "FTP to machine"
@ -2748,7 +2748,7 @@ msgid "&Background"
msgstr "В &фоне"
#, c-format
msgid "Invalid source pattern `%s'"
msgid "Invalid source pattern '%s'"
msgstr "Неправильный образец \"%s\""
msgid "&Chdir"

2
src/args.c
View File

@ -407,7 +407,7 @@ mc_args_add_extended_info_to_help (void)
mc_args__loc__footer_string = g_strdup_printf ("%s",
_
("\n"
"Please send any bug reports (including the output of `mc -V')\n"
"Please send any bug reports (including the output of 'mc -V')\n"
"as tickets at www.midnight-commander.org\n"));
mc_args__loc__header_string = g_strdup_printf (_("GNU Midnight Commander %s\n"), VERSION);

2
src/editor/edit.c
View File

@ -120,7 +120,7 @@ const char VERTICAL_MAGIC[] = { '\1', '\1', '\1', '\1', '\n' };
/* detecting an error on save is easy: just check if every byte has been written. */
/* detecting an error on read, is not so easy 'cos there is not way to tell
whether you read everything or not. */
/* FIXME: add proper `triple_pipe_open' to read, write and check errors. */
/* FIXME: add proper 'triple_pipe_open' to read, write and check errors. */
static const struct edit_filters
{
const char *read, *write, *extension;

4
src/editor/syntax.c
View File

@ -1260,7 +1260,7 @@ edit_read_syntax_file (WEdit * edit, char ***pnames, const char *syntax_file,
if (args[0] == NULL)
continue;
/* Looking for `include ...` lines before first `file ...` ones */
/* Looking for 'include ...' lines before first 'file ...' ones */
if (!found && strcmp (args[0], "include") == 0)
{
if (g != NULL)
@ -1274,7 +1274,7 @@ edit_read_syntax_file (WEdit * edit, char ***pnames, const char *syntax_file,
goto found_type;
}
/* looking for `file ...' lines only */
/* looking for 'file ...' lines only */
if (strcmp (args[0], "file") != 0)
continue;

4
src/editor/wordproc.c
View File

@ -96,7 +96,7 @@ bad_line_start (WEdit * edit, off_t p)
int c;
c = edit_get_byte (edit, p);
if (c == '.')
{ /* `...' is acceptable */
{ /* '...' is acceptable */
if (edit_get_byte (edit, p + 1) == '.')
if (edit_get_byte (edit, p + 2) == '.')
return 0;
@ -106,7 +106,7 @@ bad_line_start (WEdit * edit, off_t p)
{
if (edit_get_byte (edit, p + 1) == '-')
if (edit_get_byte (edit, p + 2) == '-')
return 0; /* `---' is acceptable */
return 0; /* '---' is acceptable */
return 1;
}
if (strchr (NO_FORMAT_CHARS_START, c))

4
src/execute.c
View File

@ -484,7 +484,7 @@ toggle_panels (void)
{
if (output_starts_shell)
{
fprintf (stderr, _("Type `exit' to return to the Midnight Commander"));
fprintf (stderr, _("Type 'exit' to return to the Midnight Commander"));
fprintf (stderr, "\n\r\n\r");
my_system (EXECUTE_INTERNAL, mc_global.tty.shell, NULL);
@ -505,7 +505,7 @@ toggle_panels (void)
subshell */
if ((quit & SUBSHELL_EXIT) != 0)
{
/* User did `exit' or `logout': quit MC */
/* User did 'exit' or 'logout': quit MC */
if (quiet_quit_cmd ())
return;

4
src/filemanager/cmd.c
View File

@ -1371,7 +1371,7 @@ edit_symlink_cmd (void)
p = selection (current_panel)->fname;
p_vpath = vfs_path_from_str (p);
q = g_strdup_printf (_("Symlink `%s\' points to:"), str_trunc (p, 32));
q = g_strdup_printf (_("Symlink '%s\' points to:"), str_trunc (p, 32));
i = readlink (p, buffer, MC_MAXPATHLEN - 1);
if (i > 0)
@ -1411,7 +1411,7 @@ edit_symlink_cmd (void)
}
else
{
message (D_ERROR, MSG_ERROR, _("`%s' is not a symbolic link"),
message (D_ERROR, MSG_ERROR, _("'%s' is not a symbolic link"),
selection (current_panel)->fname);
}
}

4
src/filemanager/file.c
View File

@ -181,9 +181,9 @@ static GSList *erase_list = NULL;
/*
* In copy_dir_dir we use two additional single linked lists: The first -
* variable name `parent_dirs' - holds information about already copied
* variable name 'parent_dirs' - holds information about already copied
* directories and is used to detect cyclic symbolic links.
* The second (`dest_dirs' below) holds information about just created
* The second ('dest_dirs' below) holds information about just created
* target directories and is used to detect when an directory is copied
* into itself (we don't want to copy infinitly).
* Both lists don't use the linkcount and name structure members of struct

2
src/filemanager/filegui.c
View File

@ -1260,7 +1260,7 @@ file_mask_dialog (FileOpContext * ctx, FileOperation operation,
if (ctx->search_handle == NULL)
{
message (D_ERROR, MSG_ERROR, _("Invalid source pattern `%s'"), source_mask);
message (D_ERROR, MSG_ERROR, _("Invalid source pattern '%s'"), source_mask);
g_free (dest_dir);
g_free (source_mask);
goto ask_file_mask;

2
src/filemanager/hotlist.c
View File

@ -880,7 +880,7 @@ add2hotlist (char *label, char *directory, enum HotListType type, listbox_append
listbox_get_current (l_hotlist, NULL, (void **) &current);
/* Make sure `..' stays at the top of the list. */
/* Make sure '..' stays at the top of the list. */
if ((current != NULL) && (current->type == HL_TYPE_DOTDOT))
pos = LISTBOX_APPEND_AFTER;

6
src/filemanager/mountlist.c
View File

@ -240,7 +240,7 @@
#ifdef __CYGWIN__
#include <windows.h>
#define ME_REMOTE me_remote
/* All cygwin mount points include `:' or start with `//'; so it
/* All cygwin mount points include ':' or start with '//'; so it
requires a native Windows call to determine remote disks. */
static int
me_remote (char const *fs_name, char const *fs_type _GL_UNUSED)
@ -262,8 +262,8 @@ me_remote (char const *fs_name, char const *fs_type _GL_UNUSED)
}
#endif
#ifndef ME_REMOTE
/* A file system is `remote' if its Fs_name contains a `:'
or if (it is of type (smbfs or cifs) and its Fs_name starts with `//'). */
/* A file system is 'remote' if its Fs_name contains a ':'
or if (it is of type (smbfs or cifs) and its Fs_name starts with '//'). */
#define ME_REMOTE(Fs_name, Fs_type) \
(strchr (Fs_name, ':') != NULL \
|| ((Fs_name)[0] == '/' \

24
src/subshell.c
View File

@ -73,7 +73,7 @@
/* State of the subshell:
* INACTIVE: the default state; awaiting a command
* ACTIVE: remain in the shell until the user hits `subshell_switch_key'
* ACTIVE: remain in the shell until the user hits 'subshell_switch_key'
* RUNNING_COMMAND: return to MC when the current command finishes */
enum subshell_state_enum subshell_state;
@ -161,7 +161,7 @@ static char subshell_cwd[MC_MAXPATHLEN + 1];
static int subshell_ready;
/* The following two flags can be changed by the SIGCHLD handler. This is */
/* OK, because the `int' type is updated atomically on all known machines */
/* OK, because the 'int' type is updated atomically on all known machines */
static volatile int subshell_alive, subshell_stopped;
/* We store the terminal's initial mode here so that we can configure
@ -254,7 +254,7 @@ init_subshell_child (const char *pty_name)
/* Set up the subshell's environment and init file name */
/* It simplifies things to change to our home directory here, */
/* and the user's startup file may do a `cd' command anyway */
/* and the user's startup file may do a 'cd' command anyway */
{
int ret;
ret = chdir (mc_config_get_home_dir ()); /* FIXME? What about when we re-run the subshell? */
@ -415,7 +415,7 @@ init_raw_mode ()
/* pty. So, instead of changing the code for execute(), pre_exec(), */
/* etc, we just set up the modes we need here, before each command. */
if (initialized == 0) /* First time: initialise `raw_mode' */
if (initialized == 0) /* First time: initialise 'raw_mode' */
{
tcgetattr (STDOUT_FILENO, &raw_mode);
raw_mode.c_lflag &= ~ICANON; /* Disable line-editing chars, etc. */
@ -433,7 +433,7 @@ init_raw_mode ()
/* --------------------------------------------------------------------------------------------- */
/**
* Wait until the subshell dies or stops. If it stops, make it resume.
* Possibly modifies the globals `subshell_alive' and `subshell_stopped'
* Possibly modifies the globals 'subshell_alive' and 'subshell_stopped'
*/
static void
@ -474,9 +474,9 @@ synchronize (void)
static gboolean
feed_subshell (int how, int fail_on_error)
{
fd_set read_set; /* For `select' */
fd_set read_set; /* For 'select' */
int maxfdp;
int bytes; /* For the return value from `read' */
int bytes; /* For the return value from 'read' */
int i; /* Loop counter */
struct timeval wtime; /* Maximum time we wait for the subshell */
@ -492,7 +492,7 @@ feed_subshell (int how, int fail_on_error)
if (!subshell_alive)
return FALSE;
/* Prepare the file-descriptor set and call `select' */
/* Prepare the file-descriptor set and call 'select' */
FD_ZERO (&read_set);
FD_SET (mc_global.tty.subshell_pty, &read_set);
@ -882,7 +882,7 @@ init_subshell (void)
init_subshell_child (pty_name);
}
/* Set up `precmd' or equivalent for reading the subshell's CWD */
/* Set up 'precmd' or equivalent for reading the subshell's CWD */
switch (subshell_type)
{
@ -999,7 +999,7 @@ read_subshell_prompt (void)
{
ssize_t i;
/* Check for `select' errors */
/* Check for 'select' errors */
if (rc == -1)
{
if (errno == EINTR)
@ -1109,7 +1109,7 @@ subshell_name_quote (const char *s)
ret = g_string_sized_new (64);
/* Prevent interpreting leading `-' as a switch for `cd' */
/* Prevent interpreting leading '-' as a switch for 'cd' */
if (s[0] == '-')
g_string_append (ret, "./");
@ -1252,7 +1252,7 @@ subshell_get_console_attributes (void)
/* --------------------------------------------------------------------------------------------- */
/**
* Figure out whether the subshell has stopped, exited or been killed
* Possibly modifies: `subshell_alive', `subshell_stopped' and `quit' */
* Possibly modifies: 'subshell_alive', 'subshell_stopped' and 'quit' */
void
sigchld_handler (int sig)

2
src/subshell.h
View File

@ -18,7 +18,7 @@ enum subshell_state_enum
RUNNING_COMMAND
};
/* For the `how' argument to various functions */
/* For the 'how' argument to various functions */
enum
{
QUIETLY,

18
src/vfs/fish/fish.c
View File

@ -521,7 +521,7 @@ fish_open_archive_int (struct vfs_class *me, struct vfs_s_super *super)
vfs_print_message (_("fish: Sending initial line..."));
/*
* Run `start_fish_server'. If it doesn't exist - no problem,
* Run 'start_fish_server'. If it doesn't exist - no problem,
* we'll talk directly to the shell.
*/
@ -870,10 +870,10 @@ fish_file_store (struct vfs_class *me, vfs_file_handler_t * fh, char *name, char
*
* ( head -c number ) | ( cat > file; cat >/dev/null )
*
* If `head' is not present on the remote system, `dd' will be used.
* Unfortunately, we cannot trust most non-GNU `head' implementations
* even if `-c' options is supported. Therefore, we separate GNU head
* (and other modern heads?) using `-q' and `-' . This causes another
* If 'head' is not present on the remote system, 'dd' will be used.
* Unfortunately, we cannot trust most non-GNU 'head' implementations
* even if '-c' options is supported. Therefore, we separate GNU head
* (and other modern heads?) using '-q' and '-' . This causes another
* implementations to fail (because of "incorrect options").
*
* Fallback is:
@ -886,7 +886,7 @@ fish_file_store (struct vfs_class *me, vfs_file_handler_t * fh, char *name, char
* rest=`expr $rest - $n`
* done
*
* `dd' was not designed for full filling of input buffers,
* 'dd' was not designed for full filling of input buffers,
* and does not report exact number of bytes (not blocks).
* Therefore a more complex shell script is needed.
*
@ -994,9 +994,9 @@ fish_linear_start (struct vfs_class *me, vfs_file_handler_t * fh, off_t offset)
fish->append = FALSE;
/*
* Check whether the remote file is readable by using `dd' to copy
* a single byte from the remote file to /dev/null. If `dd' completes
* with exit status of 0 use `cat' to send the file contents to the
* Check whether the remote file is readable by using 'dd' to copy
* a single byte from the remote file to /dev/null. If 'dd' completes
* with exit status of 0 use 'cat' to send the file contents to the
* standard output (i.e. over the network).
*/

6
src/vfs/ftpfs/ftpfs.c
View File

@ -1746,13 +1746,13 @@ ftpfs_dir_load (struct vfs_class *me, struct vfs_s_inode *dir, char *remote_path
if (num_entries == 0 && cd_first == 0)
{
/* The LIST command may produce an empty output. In such scenario
it is not clear whether this is caused by `remote_path' being
it is not clear whether this is caused by 'remote_path' being
a non-existent path or for some other reason (listing emtpy
directory without the -a option, non-readable directory, etc.).
Since `dir_load' is a crucial method, when it comes to determine
Since 'dir_load' is a crucial method, when it comes to determine
whether a given path is a _directory_, the code must try its best
to determine the type of `remote_path'. The only reliable way to
to determine the type of 'remote_path'. The only reliable way to
achieve this is trough issuing a CWD command. */
cd_first = 1;

4
src/vfs/tar/tar.c
View File

@ -631,12 +631,12 @@ tar_read_header (struct vfs_class *me, struct vfs_s_super *archive, int tard, si
case TAR_POSIX:
/* The ustar archive format supports pathnames of upto 256
* characters in length. This is achieved by concatenating
* the contents of the `prefix' and `arch_name' fields like
* the contents of the 'prefix' and 'arch_name' fields like
* this:
*
* prefix + path_separator + arch_name
*
* If the `prefix' field contains an empty string i.e. its
* If the 'prefix' field contains an empty string i.e. its
* first characters is '\0' the prefix field is ignored.
*/
if (header->header.unused.prefix[0] != '\0')

2
src/viewer/hex.c
View File

@ -124,7 +124,7 @@ mcview_display_hex (mcview_t * view)
const int ngroups = view->bytes_per_line / 4;
const screen_dimen text_start = 8 + 13 * ngroups + ((width < 80) ? 0 : (ngroups - 1 + 1));
/* 8 characters are used for the file offset, and every hex group
* takes 13 characters. On ``big'' screens, the groups are separated
* takes 13 characters. On "big" screens, the groups are separated
* by an extra vertical line, and there is an extra space before the
* text column.
*/