From e878686e46f0624dc2a2c060318399fdd4f0e859 Mon Sep 17 00:00:00 2001 From: rangersly <2281598291@qq.com> Date: Fri, 25 Apr 2025 09:42:12 +0800 Subject: [PATCH] FIX: command and vim .vimrc Tab to Space --- os/linux/command.md | 28 ++++++++++++++++++- os/linux/config/.bashrc | 1 - program/c_cpp/library/lib.md | 14 ++++++++++ program/c_cpp/library/{ => self}/offsetof.h | 0 .../c_cpp/library/{ => self}/string_hash.c | 0 .../c_cpp/library/{ => self}/thread-pool.cpp | 0 program/tool/objdump.txt | 1 + tool/vim/.vimrc | 8 ++++-- 8 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 program/c_cpp/library/lib.md rename program/c_cpp/library/{ => self}/offsetof.h (100%) rename program/c_cpp/library/{ => self}/string_hash.c (100%) rename program/c_cpp/library/{ => self}/thread-pool.cpp (100%) diff --git a/os/linux/command.md b/os/linux/command.md index dbbd7b1..2d97658 100644 --- a/os/linux/command.md +++ b/os/linux/command.md @@ -2,7 +2,7 @@ --- -## 目录 +## INDEX - [文件操作](#文件操作) - [打包压缩](#打包压缩) @@ -43,6 +43,10 @@ - [which](#which):查找命令 - [whoami](#whoami) - [uname](#uname):系统内核版本等信息 +- [objdump](../../program/tool/objdump) + + +- [INDEX](#INDEX) --- @@ -54,6 +58,9 @@ - [tar](#tar) - [dd](#dd) + +- [INDEX](#INDEX) + --- ## 磁盘 @@ -66,6 +73,9 @@ - [smartctl](#smartctl):查看smart参数 - [parted](#parted) + +- [INDEX](#INDEX) + --- ## 用户 @@ -80,6 +90,9 @@ - [newgrp](#newgrp):切换有效用户组 - [last](#last) : 查看用户登陆记录 + +- [INDEX](#INDEX) + --- ## 进程 @@ -96,6 +109,9 @@ - [jobs](#jobs) - [ulimit](#ulimit) + +- [INDEX](#INDEX) + --- ## 网络 @@ -107,20 +123,30 @@ - [wget](#wget) - [NetworkManager](#networkmanager) + +- [INDEX](#INDEX) + --- ## 系统 - [systemctl](#systemctl) +- [perf](../../program/tool/perf.md) - [dmidecode](#dmidecode) - [dpkg](#dpkg) - [apt](#apt) - [编解码工具](#编解码工具) + +- [INDEX](#INDEX) + --- ## 其他 + +- [INDEX](#INDEX) + --- ### pwd diff --git a/os/linux/config/.bashrc b/os/linux/config/.bashrc index ea07b79..5bb87fa 100644 --- a/os/linux/config/.bashrc +++ b/os/linux/config/.bashrc @@ -125,5 +125,4 @@ if ! shopt -oq posix; then fi # 终端启动时显示消息 -echo -e "\e[1;34m$(date +'%A, %B %d %Y %H:%M:%S')\e[0m" echo -e "\e[1;32mWelcome to My Linux, \e[1;35m$USER!\e[0m" diff --git a/program/c_cpp/library/lib.md b/program/c_cpp/library/lib.md new file mode 100644 index 0000000..0b65ca4 --- /dev/null +++ b/program/c_cpp/library/lib.md @@ -0,0 +1,14 @@ +# LIBRARY + +--- + +## INDEX + +- [C](#C) +- [CPP](#CPP) +- [SELF](#SELF) + - [offsetof](./self/offsetof.h) + - [string hash](./self/string_hash.c) + - [thread pool](./self/thread-pool.cpp) + +--- diff --git a/program/c_cpp/library/offsetof.h b/program/c_cpp/library/self/offsetof.h similarity index 100% rename from program/c_cpp/library/offsetof.h rename to program/c_cpp/library/self/offsetof.h diff --git a/program/c_cpp/library/string_hash.c b/program/c_cpp/library/self/string_hash.c similarity index 100% rename from program/c_cpp/library/string_hash.c rename to program/c_cpp/library/self/string_hash.c diff --git a/program/c_cpp/library/thread-pool.cpp b/program/c_cpp/library/self/thread-pool.cpp similarity index 100% rename from program/c_cpp/library/thread-pool.cpp rename to program/c_cpp/library/self/thread-pool.cpp diff --git a/program/tool/objdump.txt b/program/tool/objdump.txt index de301c2..1c77995 100644 --- a/program/tool/objdump.txt +++ b/program/tool/objdump.txt @@ -1,6 +1,7 @@ objdump -f 显示文件头 -h 显示段(section)信息 + -x 文件头和信息 -d 反汇编可执行段 -D 反汇编所有 -t 显示符号表 diff --git a/tool/vim/.vimrc b/tool/vim/.vimrc index ac4b1e5..91f3abc 100644 --- a/tool/vim/.vimrc +++ b/tool/vim/.vimrc @@ -1,8 +1,6 @@ syntax on set number "显示行号 "set rnu "相对行号 -set ts=4 -set expandtab "tab to space set autoindent "自动缩进 set encoding=utf-8 "使用utf-8字符编码 set fileencoding=utf-8 @@ -16,6 +14,12 @@ set incsearch "搜索模式下，每输入一个字符，就跳到对应 set ignorecase "忽略搜索大小写 set tags=./tags;,tags "表示从当前文件所在的目录开始查找 tags 文件，如果没有，则向上递归查找 +"Tab and Space +set expandtab "tab to space +set ts=4 +set softtabstop=4 " 编辑时退格键删除的空格数 +set shiftwidth=4 " 自动缩进使用的空格数 + "缓冲区操作 nnoremap b :buffers:b nnoremap e :b#