Unified · Split
| @@ -27,10 +27,10 @@ void setlabel(Window*, char*); · 26 unmodified lines | |||
| 27 | /* Wctl */ | 27 | /* Wctl */ |
| 28 | int wctlmesg(Window*, char*, int, char*); | 28 | int wctlmesg(Window*, char*, int, char*); |
| 29 | 29 | ||
| 30 | /* Ixp */ | 30 | /* Fsys */ |
| 31 | void ixprread(void*, char*); | 31 | int fsloop(char*); |
| 32 | int ixpserve(char*); | ||
| 33 | void killrespond(Window*); | 32 | void killrespond(Window*); |
| 33 | void readreply(void*, char*); | ||
| 34 | 34 | ||
| 35 | /* X connection */ | 35 | /* X connection */ |
| 36 | int xinit(void); | 36 | int xinit(void); |
| @@ -673,7 +673,7 @@ killrespond(Window *w) · 672 unmodified lines | |||
| 673 | 673 | ||
| 674 | /* Reply a read request */ | 674 | /* Reply a read request */ |
| 675 | void | 675 | void |
| 676 | ixprread(void *v, char *buf) | 676 | readreply(void *v, char *buf) |
| 677 | { | 677 | { |
| 678 | Ixp9Req *r; | 678 | Ixp9Req *r; |
| 679 | IxpFileId *f; | 679 | IxpFileId *f; |
| @@ -15,7 +15,7 @@ void endconnection(IxpConn*); · 14 unmodified lines | |||
| 15 | void eventfdready(IxpConn*); | 15 | void eventfdready(IxpConn*); |
| 16 | 16 | ||
| 17 | int | 17 | int |
| 18 | ixpserve(char *address) | 18 | fsloop(char *address) |
| 19 | { | 19 | { |
| 20 | char buf[512]; | 20 | char buf[512]; |
| 21 | int fd; | 21 | int fd; |
| @@ -79,7 +79,7 @@ replykbd(Kbdbuf *kbd, void *r) · 78 unmodified lines | |||
| 79 | 79 | ||
| 80 | rune = kbd->r[kbd->ri]; | 80 | rune = kbd->r[kbd->ri]; |
| 81 | sprint(buf, "%C", rune); | 81 | sprint(buf, "%C", rune); |
| 82 | ixprread(r, buf); | 82 | readreply(r, buf); |
| 83 | } | 83 | } |
| 84 | 84 | ||
| 85 | static | 85 | static |
| @@ -62,7 +62,7 @@ main(int argc, char **argv) · 61 unmodified lines | |||
| 62 | memimageinit(); | 62 | memimageinit(); |
| 63 | 63 | ||
| 64 | /* Start the 9p server */ | 64 | /* Start the 9p server */ |
| 65 | return ixpserve(address); | 65 | return fsloop(address); |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | void | 68 | void |
| @@ -80,7 +80,7 @@ replymouse(Mousebuf *mouse, void *r) · 79 unmodified lines | |||
| 80 | c = 'r'; | 80 | c = 'r'; |
| 81 | n = sprint(buf, "%c%11d %11d %11d %11ld ", c, m.xy.x, m.xy.y, m.buttons, m.msec); | 81 | n = sprint(buf, "%c%11d %11d %11d %11ld ", c, m.xy.x, m.xy.y, m.buttons, m.msec); |
| 82 | buf[n] = '\0'; | 82 | buf[n] = '\0'; |
| 83 | ixprread(r, buf); | 83 | readreply(r, buf); |
| 84 | mouse->resized = 0; | 84 | mouse->resized = 0; |
| 85 | } | 85 | } |
| 86 | 86 | ||