From ef837db00ec49d6bee8bdc5f68744d9bd70920bf Mon Sep 17 00:00:00 2001 From: dongdigua Date: Tue, 13 Dec 2022 17:29:08 +0800 Subject: [PATCH] fix quote format, slightly change CSS(ol) - collections add `wow` tag - binary_exploit opti link - add magical_index icon --- .github/workflows/site.yml | 2 +- css/main.css | 14 ++++++++------ index.html | 6 +++--- js/random-quote.js | 4 +++- org/binary_exploit.org | 5 +++-- org/ideas.org | 1 + org/internet_collections.org | 23 ++++++++++++++++++----- patches/bili_ip.sh | 3 --- patches/icons.sh | 7 +++++++ 9 files changed, 44 insertions(+), 21 deletions(-) delete mode 100755 patches/bili_ip.sh create mode 100755 patches/icons.sh diff --git a/.github/workflows/site.yml b/.github/workflows/site.yml index b3b4b71..143a1ca 100644 --- a/.github/workflows/site.yml +++ b/.github/workflows/site.yml @@ -45,7 +45,7 @@ jobs: - name: Patch HTML run: | tree _site - sudo ./patches/bili_ip.sh + sudo ./patches/icons.sh - name: Upload artifact uses: actions/upload-pages-artifact@v1 diff --git a/css/main.css b/css/main.css index e55acf9..21369c5 100644 --- a/css/main.css +++ b/css/main.css @@ -5,7 +5,7 @@ https://github.com/rgb-24bit/org-html-theme-list org-joshua { body { font-family: "Helvetica Neue", "Lucida Grande", "Lucida Sans Unicode", Helvetica, Arial, sans-serif !important; - font-size: 14px; + font-size: 16px; line-height: 21px; color: #333; max-width: 62em; @@ -78,7 +78,7 @@ https://github.com/rgb-24bit/org-html-theme-list org-joshua h2 { font-family:Arial,sans-serif; - font-size:1.45em; + font-size:1.5em; line-height:16px; padding:7px 0 0 0; color: #666; @@ -94,7 +94,7 @@ https://github.com/rgb-24bit/org-html-theme-list org-joshua h3 { font-family:Arial,sans-serif; - font-size:1.3em; + font-size:1.4em; color: #666; margin-left: 0.6em; } @@ -105,13 +105,13 @@ https://github.com/rgb-24bit/org-html-theme-list org-joshua h4 { font-family:Arial,sans-serif; - font-size:1.2em; + font-size:1.3em; margin-left: 1.2em; color: #666; } .outline-text-4 { - margin-left: 1.45em; + margin-left: 1.4em; } a { @@ -134,12 +134,14 @@ https://github.com/rgb-24bit/org-html-theme-list org-joshua list-style-position: outside; } ol { - list-style-type: decimal; + list-style-type: circle; list-style-position: outside; } + /* ol ol { list-style-type: lower-alpha; } + */ .todo { color: #CA0000; diff --git a/index.html b/index.html index e7bba85..2af4044 100644 --- a/index.html +++ b/index.html @@ -45,9 +45,9 @@ "GeoGebra" "Minecraft redstone survival" "anime" - (Lost (In (Suspicious (Parentheses)))))))) -
- "" + (Lost (In (Suspicious (Parentheses)))))))) +
+ 

   
 
 
diff --git a/js/random-quote.js b/js/random-quote.js
index d8705c4..1eadf7c 100644
--- a/js/random-quote.js
+++ b/js/random-quote.js
@@ -15,6 +15,7 @@ var data = [
     "我这人有几个缺点: 第一, 不会数数; 第二, 记性不好; 第四, 不会数数",
     "圈纸拿回家研磨去了",
     "我们从这里启航♫",
+    "Learn. Unlearn. Relearn.",
 
     "The internet is FULL, go away!",
     "May the --force be with you",
@@ -34,7 +35,8 @@ var data = [
     "ravynOS, Always; FreeBSD, Mostly; Linux, Sometimes; macOS, Maybe",
     "有什么业务是腾讯不做的吗?!",
     "Rewrite in Rust!",
+    "Your text editor runs in a web browser,\nMy web browser runs inside a text editor,\nWe are not the same",
 ];
 
 var index = Math.floor((Math.random() * data.length));
-window.document.getElementById("quote").innerHTML = data[index];
+window.document.getElementById("quote").innerHTML = "\"" + data[index] + "\"";
diff --git a/org/binary_exploit.org b/org/binary_exploit.org
index ad19161..1eeb2c4 100644
--- a/org/binary_exploit.org
+++ b/org/binary_exploit.org
@@ -45,8 +45,9 @@ disassembler
 trace sys/lib call
 *** [[https://youtu.be/mT1V7IL2FHY][0x0A: deal with numbers]]
 **** endian?
-from [[https://zh.wikipedia.org/zh-cn/%E5%AD%97%E8%8A%82%E5%BA%8F][Wikipedia]]
-[[../images/Big-Endian.svg.png ]][[../images/Little-Endian.svg.png]]
+from [[https://zh.wikipedia.org/zh-cn/字节序][Wikipedia]]
+[[https://upload.wikimedia.org/wikipedia/commons/5/54/Big-Endian.svg]]
+[[https://upload.wikimedia.org/wikipedia/commons/e/ed/Little-Endian.svg]]
 x86 is little endian
 **** tools
 ***** python
diff --git a/org/ideas.org b/org/ideas.org
index d018718..1d5d648 100644
--- a/org/ideas.org
+++ b/org/ideas.org
@@ -19,3 +19,4 @@ just a [[https://support.microsoft.com/en-us/windows/windows-7-support-ended-on-
 * 用 eww 实现苹果的 "灵动岛"?
 呵呵, 在B站看到这样的基本就是壁纸软件的广告
 * Nethack x Minecraft
+* 穿越机/无人机竞速
diff --git a/org/internet_collections.org b/org/internet_collections.org
index 6e1ec53..245df0e 100644
--- a/org/internet_collections.org
+++ b/org/internet_collections.org
@@ -1,6 +1,6 @@
 #+TAGS: elixir(e) rust(r) c(c) lisp(l) python(p) nim(n)
 #+TAGS: lowlevel(w) frontend(f) backend(b) algorithm(a) math(t)
-#+TAGS: hack(h) fun(u)
+#+TAGS: hack(h) fun(u) wow(O)
 #+TAGS: emacs(m) linux(x) iot(i) plan9(9) BSD(B)
 #+OPTIONS: toc:1 ^:{}
 
@@ -31,7 +31,7 @@ Two Principles of Deadlines:
 1. All deadlines converge on the same day—Deadline Day.
 2. Every day is Deadline Day.
 #+END_QUOTE
-*** [[https://bford.info/pub/net/p2pnat/][Peer-to-Peer Communication Across Network Address Translators]]
+*** [[https://bford.info/pub/net/p2pnat/][Peer-to-Peer Communication Across Network Address Translators]]     :wow:
 ** [[https://shakaianee.top/][社会易姐]]
 ** [[https://floooh.github.io/][floooh(The Brain Dump)]]                                                :c:
 07 年开始, cpu emulator
@@ -76,7 +76,7 @@ CPU, IC, ARM
 ** [[http://jujuba.me/][Ground Oddity]]
 出国
 *** [[http://jujuba.me/posts/program-analysis-via-llvm-pass.html][LLVM Pass来实现简化版taint analysis]]
-*** [[http://jujuba.me/posts/taste-of-code.html][代码的taste]]
+*** [[http://jujuba.me/posts/taste-of-code.html][代码的taste]]                                                       :wow:
 #+ATTR_HTML: :width 400px
 [[http://jujuba.me/imgs/linus-on-TED.png]]
 ** [[https://cireu.github.io/2019/09/17/lisp-setf/][NIL: setf 中「f」的本意]]
@@ -111,7 +111,7 @@ F#, M1(r0$0f+, very high quality
 ** [[http://www.xianwaizhiyin.net/][弦外之音]]                                                     :c:lowlevel:
 源码分析
 *** [[https://www.xianwaizhiyin.net/?cat=24][state-thread 源码分析]]
-** TODO [[https://lightless.me/categories.html][lightless blog]]                                                :hack:
+** [[https://lightless.me/categories.html][lightless blog]]                                                     :hack:
 ** [[https://bheisler.github.io/post/state-of-gpgpu-in-rust/][The State of GPGPU in Rust]]                                :rust:lowlevel:
 ** [[https://litchipi.github.io/series/container_in_rust][Writing a container in Rust]]
 *** [[https://litchipi.github.io/infosec/2022/07/08/copyit-until-you-makeit.html][Copy it until you make it]]
@@ -211,7 +211,20 @@ kernel, LFS
 ** [[https://mthli.xyz][Matthew Lee]]
 *** [[https://mthli.xyz/duff-device/][深入理解达夫设备]]
 *** [[https://mthli.xyz/stackful-stackless/][有栈协程与无栈协程]]
-**** [[https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html][PuTTY's author: Coroutines in C]]
+**** [[https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html][PuTTY's author: Coroutines in C]]                                 :wow:
+#+BEGIN_SRC c
+// Black Magic
+#define crBegin static int state=0; switch(state) { case 0:
+#define crReturn(x) do { state=__LINE__; return x; case __LINE__:; } while (0)
+#define crFinish }
+int function(void) {
+    static int i;
+    crBegin;
+    for (i = 0; i < 10; i++)
+        crReturn(i);
+    crFinish;
+}
+#+END_SRC
 ** TODO [[https://magcius.github.io/xplain/article/][explain X window system]]
 
 ** B
diff --git a/patches/bili_ip.sh b/patches/bili_ip.sh
deleted file mode 100755
index 54226e7..0000000
--- a/patches/bili_ip.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-sed -i '6a ' _site/bili_ip.html
diff --git a/patches/icons.sh b/patches/icons.sh
new file mode 100755
index 0000000..aad0af8
--- /dev/null
+++ b/patches/icons.sh
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+# bili_ip
+sed -i '6a ' _site/bili_ip.html
+
+# magical index
+sed -i '6a ' _site/internet_collections.html